aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-10-01 00:43:03 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2020-07-02 19:55:09 +0200
commit9645c0b322c108a6b3a2d437fae10a2529eb3f7e (patch)
treed5bf0a2f21edcec27822bece70ff28d409b63359
parent71c228d2b8c93857a104c034937b1350d1959b3f (diff)
downloadffmpeg-9645c0b322c108a6b3a2d437fae10a2529eb3f7e.tar.gz
avcodec/dstdec: Use get_ur_golomb_jpegls()
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> (cherry picked from commit a76690c02b4fd12d7fac6f753af8bad72c82d55c) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/dstdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dstdec.c b/libavcodec/dstdec.c
index daf906ba0c..c548174331 100644
--- a/libavcodec/dstdec.c
+++ b/libavcodec/dstdec.c
@@ -120,7 +120,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;