diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-06 18:28:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-06 18:28:57 +0200 |
| commit | 7b6a51f59c467ab9f4b73122dc269206fb517425 (patch) | |
| tree | 8060c0ec46fb72c86b9edb1ad7b10684611beecf /libavcodec/shorten.c | |
| parent | 0884b1c5ffe07584984dadad29346c95c78fac19 (diff) | |
avcodec/shorten: Check k in get_uint()
Fixes: undefined shift
Fixes: 1371/clusterfuzz-testcase-minimized-5770822591447040
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/shorten.c')
| -rw-r--r-- | libavcodec/shorten.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c index 90569bdb1f..2d3540a229 100644 --- a/libavcodec/shorten.c +++ b/libavcodec/shorten.c @@ -160,8 +160,11 @@ static int allocate_buffers(ShortenContext *s) static inline unsigned int get_uint(ShortenContext *s, int k) { - if (s->version != 0) + if (s->version != 0) { k = get_ur_golomb_shorten(&s->gb, ULONGSIZE); + if (k > 31U) + return AVERROR_INVALIDDATA; + } return get_ur_golomb_shorten(&s->gb, k); } |