From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 8424C4E4F8 for ; Sat, 3 May 2025 17:56:35 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4572668BA51; Sat, 3 May 2025 20:55:51 +0300 (EEST) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3B77E687C4C for ; Sat, 3 May 2025 20:55:40 +0300 (EEST) Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-43cf06eabdaso24148845e9.2 for ; Sat, 03 May 2025 10:55:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20230601.gappssmtp.com; s=20230601; t=1746294939; x=1746899739; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=gOgamsL5RKGybHyCHhpsJ/R4Jq1FjtGrSRbz6vn8rBk=; b=wglAMSiL3RbLY9NAIbxGxq5jTKpeC+AZnwnbLpJmEwj8FrGAxJZ0LWjNxE/JxdK2H2 gICgD7ilZk8f2nAQ2TEmH+fFInA4wNfzn+0buWrOeE+EhxnHXjzedsO9dkwr7xcaJ60s XQbwJ2/iXtD9afMDdom8eOPWrE4QgRtoGs0HRw9A8yy8gogMF1DoDc9//PhvKBgpDj/e 7nOm+lk78M1okxxquxovGyH0nKLo32/9hyGvEIMs+ozFLlQRyMvy7uSN4oi4d44jsVzq Pl+3iwR4IxVBH0JG6kMu+CA7IXIgO9h909SV5aDafBSgEpobJ7Muu6JthXjM59ywNNMp /izA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746294939; x=1746899739; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gOgamsL5RKGybHyCHhpsJ/R4Jq1FjtGrSRbz6vn8rBk=; b=ekOwOBLpZA8WXFz019RmAlNlJ3tZ8asjJxU+Q28YT9me4c4d6gZmrKXSqUTp5hcfCS MO+0a7SwxuiRmWeItoqc22Bg4N1o99pMrWdXf7tzQbVcMzHOfWsk5kxCvDGQZwzRipty hoQW0lH+mUQPQF4Tx8/1Wrze/sYnVuzMMSXu6HPOsVCJAXxkJvpQXUQOZmjZK55bnsCA QGk83eHV6JaYo/dNElagKjIA4LklVPuEnVdJVSyxqSV35DvkYoJ7fX6gAleSUrVzHaBJ SGfCzSG/7UzLKGhyOalPyWU4O8xwLRgMTGatHQCYWrV8CNgzSRyTE2umCD0Aumeq8EkO 8zJQ== X-Gm-Message-State: AOJu0YylaHvbgax1Gj3cj9JZslEzp2G3tTJDbc184Ru9OrXPgA+6gdyr dl+xJ/TzhM5k0bzrU9+ZE9ha0WJZABqexKYgSrikXvHuPBtk0c6316x221wsaGymOWlaYDc3RMv 7MskEuQ== X-Gm-Gg: ASbGncujEpJiANJFBig+wB86iA/af+T0QhlLfXBMO5pTw/PbIpvQVNfIiCTNkVvOpVt e0U6v1ZwKokPaj3ZcLbeTAzeXD+fi42efTec39G0S+HlwhmaQ3wyzRRLQJUSkN8ikmF/pGwiB/L 5bj/Zblb7GO51DIfFWxJ2Je/cymxoBHAQFlx5JUXJm8BNpg/QZ7GRvnczCCkCqAh2y9mGlkA0+M +QCeqzMDrhJyxjqDa5kCehXrc9a8FyDwVyilSrsrQFOZINPkGbJqPNOSDRcMYu98kuicNqyAKxa qw8VOgqmO+6GzW4/Mu1I179w3HiFXjq7hezneCNyLKG2ZmwxiNg8FNpqilS02OGmGMMz86ygGhb Iux086hV0ubZzgse4tJprRJA= X-Google-Smtp-Source: AGHT+IFf8o7w6KXXUmvWwUrrvfpfYeptZWg1oFgY1dnXhTXRXpwpEq2CAYYYLDyk1mc9i8y/trwIEg== X-Received: by 2002:a05:600c:c07:b0:43c:fe9f:ab90 with SMTP id 5b1f17b1804b1-441c4937630mr13347715e9.28.1746294939454; Sat, 03 May 2025 10:55:39 -0700 (PDT) Received: from localhost.localdomain (cpc92320-cmbg19-2-0-cust719.5-4.cable.virginm.net. [82.13.66.208]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-441b8a3156asm80683645e9.38.2025.05.03.10.55.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 May 2025 10:55:39 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sat, 3 May 2025 18:55:21 +0100 Message-ID: <20250503175527.1517092-5-sw@jkqxz.net> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250503175527.1517092-1-sw@jkqxz.net> References: <20250503175527.1517092-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/6] apv_entropy: Improve robustness to bitstream errors X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --- libavcodec/apv_entropy.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/libavcodec/apv_entropy.c b/libavcodec/apv_entropy.c index 00e0b4fbdf..a5648c09b4 100644 --- a/libavcodec/apv_entropy.c +++ b/libavcodec/apv_entropy.c @@ -84,6 +84,14 @@ static unsigned int apv_read_vlc(GetBitContext *gbc, int k_param, next_bits = show_bits(gbc, 16); leading_zeroes = 15 - av_log2(next_bits); + if (leading_zeroes == 0) { + // This can't happen mid-stream because the lookup would + // have resolved a leading one into a shorter code, but it + // can happen if we are hitting the end of the buffer. + // Return an invalid code to propagate as an error. + return APV_MAX_TRANS_COEFF + 1; + } + skip_bits(gbc, leading_zeroes + 1); return (2 << k_param) + @@ -182,6 +190,14 @@ int ff_apv_entropy_decode_block(int16_t *coeff, else level = abs_ac_coeff_minus1 + 1; + if (level < APV_MIN_TRANS_COEFF || + level > APV_MAX_TRANS_COEFF) { + av_log(state->log_ctx, AV_LOG_ERROR, + "Out-of-range AC coefficient value: %d " + "(from prev_level %d abs_ac_coeff_minus1 %d sign_ac_coeff %d)\n", + level, prev_level, abs_ac_coeff_minus1, sign_ac_coeff); + } + coeff[ff_zigzag_direct[scan_pos]] = level; prev_level = abs_ac_coeff_minus1 + 1; -- 2.47.2 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".