aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-11-02 18:34:09 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2017-12-30 21:11:31 +0100
commit286e3bf17429e3d8eee4fbe36110c9c0764fa74d (patch)
tree2d787f6e489f8fb14e9ba42e8bd10a170c67b093
parent19fb467fcbbfdb9cba784fd0cd05d6e8333bc3fb (diff)
downloadffmpeg-286e3bf17429e3d8eee4fbe36110c9c0764fa74d.tar.gz
avcodec/cngdec: Fix integer clipping
Fixes: runtime error: value -36211.7 is outside the range of representable values of type 'short' Fixes: 2992/clusterfuzz-testcase-6649611793989632 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 51090133b31bc719ea868db15d3ee38e9dbe90f1) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/cngdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/cngdec.c b/libavcodec/cngdec.c
index 34f881448d..42ef5bb3db 100644
--- a/libavcodec/cngdec.c
+++ b/libavcodec/cngdec.c
@@ -147,7 +147,7 @@ static int cng_decode_frame(AVCodecContext *avctx, void *data,
return ret;
buf_out = (int16_t *)frame->data[0];
for (i = 0; i < avctx->frame_size; i++)
- buf_out[i] = p->filter_out[i + p->order];
+ buf_out[i] = av_clip_int16(p->filter_out[i + p->order]);
memcpy(p->filter_out, p->filter_out + avctx->frame_size,
p->order * sizeof(*p->filter_out));