Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-05-18 17:51:08 +0300
committerMichael Niedermayer <michael@niedermayer.cc>2017-05-18 19:08:23 +0300
commitd32ebce8fd79bb859ba4a04c92470a052f2aafa6 (patch)
treea77fb77942d73faa50da56c8372fdbdc6776234e /libavcodec/pixlet.c
parent5c9e12bc6d3e4847896fcb51e76d26aa7922e5d7 (diff)
avcodec/pixlet: Fix reading invalid numbers of bits
Fixes: asertion failure Fixes: 1664/clusterfuzz-testcase-minimized-6587801187385344 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/pixlet.c')
-rw-r--r--libavcodec/pixlet.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/pixlet.c b/libavcodec/pixlet.c
index 05262648ae..0dfd5edbf7 100644
--- a/libavcodec/pixlet.c
+++ b/libavcodec/pixlet.c
@@ -229,6 +229,8 @@ static int read_high_coeffs(AVCodecContext *avctx, uint8_t *src, int16_t *dst, i
cnt1 = get_bits(b, nbits);
} else {
pfx = 14 + ((((uint64_t)(value - 14)) >> 32) & (value - 14));
+ if (pfx < 1 || pfx > 25)
+ return AVERROR_INVALIDDATA;
cnt1 *= (1 << pfx) - 1;
shbits = show_bits(b, pfx);
if (shbits <= 1) {