]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/dstdec: Use get_ur_golomb_jpegls()
authorMichael Niedermayer <michael@niedermayer.cc>
Mon, 30 Sep 2019 22:43:03 +0000 (00:43 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Sun, 15 Dec 2019 00:01:22 +0000 (01:01 +0100)
Fixes: shift exponent -4 is negative
Fixes: 17793/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DST_fuzzer-5766088435957760
Fixes: 18989/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DST_fuzzer-5175008116867072
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/dstdec.c

index ae3fe428ddba0d76c0375b6b5e1bd966530917e4..880b838b0cec70641f7204eb18d093f055993ab3 100644 (file)
@@ -121,7 +121,7 @@ static int read_map(GetBitContext *gb, Table *t, unsigned int map[DST_MAX_CHANNE
 
 static av_always_inline int get_sr_golomb_dst(GetBitContext *gb, unsigned int k)
 {
-    int v = get_ur_golomb(gb, k, get_bits_left(gb), 0);
+    int v = get_ur_golomb_jpegls(gb, k, get_bits_left(gb), 0);
     if (v && get_bits1(gb))
         v = -v;
     return v;