virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

lavc/smvjpegdec: Avoid null dereference and return meaningful error codes

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Himangi Saraogi
2015-04-01 21:35:16 +05:30
committed by Michael Niedermayer
parent b9fbd034bf
commit 5b02e84bdb
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/smvjpegdec.c
View File

@@ -94,7 +94,7 @@ static av_cold int smvjpeg_decode_init(AVCodecContext *avctx)
SMVJpegDecodeContext *s = avctx->priv_data; SMVJpegDecodeContext *s = avctx->priv_data;
AVCodec *codec; AVCodec *codec;
AVDictionary *thread_opt = NULL; AVDictionary *thread_opt = NULL;
int ret = 0; int ret = 0, r;
s->frames_per_jpeg = 0; s->frames_per_jpeg = 0;
@@ -115,13 +115,14 @@ static av_cold int smvjpeg_decode_init(AVCodecContext *avctx)
if (s->frames_per_jpeg <= 0) { if (s->frames_per_jpeg <= 0) {
av_log(avctx, AV_LOG_ERROR, "Invalid number of frames per jpeg.\n"); av_log(avctx, AV_LOG_ERROR, "Invalid number of frames per jpeg.\n");
ret = -1; ret = AVERROR_INVALIDDATA;
} }
codec = avcodec_find_decoder(AV_CODEC_ID_MJPEG); codec = avcodec_find_decoder(AV_CODEC_ID_MJPEG);
if (!codec) { if (!codec) {
av_log(avctx, AV_LOG_ERROR, "MJPEG codec not found\n"); av_log(avctx, AV_LOG_ERROR, "MJPEG codec not found\n");
ret = -1; smvjpeg_decode_end(avctx);
return AVERROR_DECODER_NOT_FOUND;
} }
s->avctx = avcodec_alloc_context3(codec); s->avctx = avcodec_alloc_context3(codec);
@@ -130,9 +131,9 @@ static av_cold int smvjpeg_decode_init(AVCodecContext *avctx)
s->avctx->refcounted_frames = 1; s->avctx->refcounted_frames = 1;
s->avctx->flags = avctx->flags; s->avctx->flags = avctx->flags;
s->avctx->idct_algo = avctx->idct_algo; s->avctx->idct_algo = avctx->idct_algo;
if (ff_codec_open2_recursive(s->avctx, codec, &thread_opt) < 0) { if ((r = ff_codec_open2_recursive(s->avctx, codec, &thread_opt)) < 0) {
av_log(avctx, AV_LOG_ERROR, "MJPEG codec failed to open\n"); av_log(avctx, AV_LOG_ERROR, "MJPEG codec failed to open\n");
ret = -1; ret = r;
} }
av_dict_free(&thread_opt); av_dict_free(&thread_opt);