From: Lynne via ffmpeg-devel <ffmpeg-devel@ffmpeg.org>
To: ffmpeg-devel@ffmpeg.org
Cc: Lynne <dev@lynne.ee>
Subject: [FFmpeg-devel] [PATCH 1/4] aacdec_usac: prevent get_bits(0) in get_escaped_value
Date: Sun, 2 Jun 2024 23:54:26 +0200
Message-ID: <20240602215436.2007571-1-dev@lynne.ee> (raw)
Some calls to get_escaped_value() specify 0 bits as the third value.
This would result in get_bits(0), which is not a correct usage of the
get_bits API.
---
libavcodec/aac/aacdec_usac.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/aac/aacdec_usac.c b/libavcodec/aac/aacdec_usac.c
index 00ec74718b..d98c014cf8 100644
--- a/libavcodec/aac/aacdec_usac.c
+++ b/libavcodec/aac/aacdec_usac.c
@@ -38,7 +38,7 @@ static inline uint32_t get_escaped_value(GetBitContext *gb, int nb1, int nb2, in
return val;
val += val2 = get_bits(gb, nb2);
- if (val2 == ((1 << nb2) - 1))
+ if (nb3 && (val2 == ((1 << nb2) - 1)))
val += get_bits(gb, nb3);
return val;
--
2.43.0.381.gb435a96ce8
_______________________________________________
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".
next reply other threads:[~2024-06-02 21:55 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-02 21:54 Lynne via ffmpeg-devel [this message]
2024-06-02 21:54 ` [FFmpeg-devel] [PATCH 2/4] aacdec_usac: error out on too many elements Lynne via ffmpeg-devel
2024-06-02 21:54 ` [FFmpeg-devel] [PATCH 3/4] aacdec_usac: error out on receiving too many channels for the current layout Lynne via ffmpeg-devel
2024-06-02 21:54 ` [FFmpeg-devel] [PATCH 4/4] aacdec_usac: fix off by one error check on channel numbers Lynne via ffmpeg-devel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240602215436.2007571-1-dev@lynne.ee \
--to=ffmpeg-devel@ffmpeg.org \
--cc=dev@lynne.ee \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git