diff mbox

[FFmpeg-devel,1/3] avcodec/cook: Use 3 stage VLC decoding for channel_coupling

Message ID 20191125224717.26174-1-michael@niedermayer.cc
State New
Headers show

Commit Message

Michael Niedermayer Nov. 25, 2019, 10:47 p.m. UTC
Fixes: shift exponent -1 is negative
Fixes: out of array read
Fixes: 19028/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_COOK_fuzzer-5759766471376896
Fixes: 19037/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_COOK_fuzzer-5734106625474560

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

Patch

diff --git a/libavcodec/cook.c b/libavcodec/cook.c
index 248e59256f..d0b41a2431 100644
--- a/libavcodec/cook.c
+++ b/libavcodec/cook.c
@@ -759,7 +759,7 @@  static int decouple_info(COOKContext *q, COOKSubpacket *p, int *decouple_tab)
         for (i = 0; i < length; i++)
             decouple_tab[start + i] = get_vlc2(&q->gb,
                                                p->channel_coupling.table,
-                                               p->channel_coupling.bits, 2);
+                                               p->channel_coupling.bits, 3);
     else
         for (i = 0; i < length; i++) {
             int v = get_bits(&q->gb, p->js_vlc_bits);