summaryrefslogtreecommitdiffstats
path: root/libavcodec/mjpeg2jpeg_bsf.c
diff options
context:
space:
mode:
authorJan Sebechlebsky <sebechlebskyjan@gmail.com>2016-05-02 02:51:25 +0300
committerMichael Niedermayer <michael@niedermayer.cc>2016-05-02 04:10:03 +0200
commit0ff3489534ea8ee3bdaf2680a45300d21078bf3e (patch)
treef3d0be5385b1e85367d988bc17410b8bd744ca1d /libavcodec/mjpeg2jpeg_bsf.c
parent1fee770a1cece01f1e31a3127f7039e784a449eb (diff)
downloadffmpeg-streaming-0ff3489534ea8ee3bdaf2680a45300d21078bf3e.zip
ffmpeg-streaming-0ff3489534ea8ee3bdaf2680a45300d21078bf3e.tar.gz
avcodec/mjpeg2jpeg_bsf: Check ff_bsf_get_packet success
This fixes ticket #5487 - mjpeg2jpeg bitstream filter causes segmentation fault with header-less mjpeg. Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/mjpeg2jpeg_bsf.c')
-rw-r--r--libavcodec/mjpeg2jpeg_bsf.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/mjpeg2jpeg_bsf.c b/libavcodec/mjpeg2jpeg_bsf.c
index 2d4cee2..6f02bc0 100644
--- a/libavcodec/mjpeg2jpeg_bsf.c
+++ b/libavcodec/mjpeg2jpeg_bsf.c
@@ -86,6 +86,8 @@ static int mjpeg2jpeg_filter(AVBSFContext *ctx, AVPacket *out)
uint8_t *output;
ret = ff_bsf_get_packet(ctx, &in);
+ if (ret < 0)
+ return ret;
if (in->size < 12) {
av_log(ctx, AV_LOG_ERROR, "input is truncated\n");
OpenPOWER on IntegriCloud