[FFmpeg-devel,2/2] avcodec/bitstream: Check for more conflicting codes in build_table()

Submitted by Michael Niedermayer on June 5, 2019, 10:55 a.m.

Details

Message ID 20190605105517.24005-2-michael@niedermayer.cc
State Accepted
Commit a7e3b271fc9a91c5d2e4df32e70e525c15c6d3ef
Headers show

Commit Message

Michael Niedermayer June 5, 2019, 10:55 a.m.
Fixes: out of array read
Fixes: 14563/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AGM_fuzzer-5646451545210880

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/bitstream.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/libavcodec/bitstream.c b/libavcodec/bitstream.c
index 590b490527..be8a0f634d 100644
--- a/libavcodec/bitstream.c
+++ b/libavcodec/bitstream.c
@@ -188,8 +188,9 @@  static int build_table(VLC *vlc, int table_nb_bits, int nb_codes,
             }
             for (k = 0; k < nb; k++) {
                 int bits = table[j][1];
+                int oldsym  = table[j][0];
                 ff_dlog(NULL, "%4x: code=%d n=%d\n", j, i, n);
-                if (bits != 0 && bits != n) {
+                if ((bits || oldsym) && (bits != n || oldsym != symbol)) {
                     av_log(NULL, AV_LOG_ERROR, "incorrect codes\n");
                     return AVERROR_INVALIDDATA;
                 }