diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-15 17:21:10 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-15 17:52:07 +0200 |
commit | 211ec9196dffc3d2261e5bf27a003947dcc598cc (patch) | |
tree | 63b17da27900fa900b516fe2ba7e204374c7405b | |
parent | e4318f68750275f50474a241ce316f9fe6afb53e (diff) | |
download | ffmpeg-211ec9196dffc3d2261e5bf27a003947dcc598cc.tar.gz |
avcodec/smvjpegdec: check avcodec_decode_video2() return code
Fixes CID1271810
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit cdd25f9a3df3905543a5546cf6076d2eaf895736)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | libavcodec/smvjpegdec.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/smvjpegdec.c b/libavcodec/smvjpegdec.c index 375c9d91c3..c99b029c87 100644 --- a/libavcodec/smvjpegdec.c +++ b/libavcodec/smvjpegdec.c @@ -155,6 +155,10 @@ static int smvjpeg_decode_frame(AVCodecContext *avctx, void *data, int *data_siz if (!cur_frame) { av_frame_unref(mjpeg_data); ret = avcodec_decode_video2(s->avctx, mjpeg_data, &s->mjpeg_data_size, avpkt); + if (ret < 0) { + s->mjpeg_data_size = 0; + return ret; + } } else if (!s->mjpeg_data_size) return AVERROR(EINVAL); |