diff options
| author | Martin Storsjö <martin@martin.st> | 2013-09-16 16:01:02 +0300 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2014-01-07 09:43:56 +0100 |
| commit | f0db793bee82a73bbdaab824f02e8dd081a5d87b (patch) | |
| tree | 833d701131ae426cc6fa64dfbfb959a80458ff5d /libavcodec | |
| parent | 75f811babc08af5eadf4f2ea23b3e5c46cadbe2a (diff) | |
| download | ffmpeg-f0db793bee82a73bbdaab824f02e8dd081a5d87b.tar.gz | |
rv34: Check the return value from ff_rv34_decode_init
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 711c970168297683860422e95d6b7e37ee3c8367)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit 20c8f176293e7520c6205b664e25ecf8a711253e)
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/rv30.c | 4 | ||||
| -rw-r--r-- | libavcodec/rv40.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/libavcodec/rv30.c b/libavcodec/rv30.c index 4828e982b7..7b280f4fc5 100644 --- a/libavcodec/rv30.c +++ b/libavcodec/rv30.c @@ -244,9 +244,11 @@ static void rv30_loop_filter(RV34DecContext *r, int row) static av_cold int rv30_decode_init(AVCodecContext *avctx) { RV34DecContext *r = avctx->priv_data; + int ret; r->rv30 = 1; - ff_rv34_decode_init(avctx); + if ((ret = ff_rv34_decode_init(avctx)) < 0) + return ret; if(avctx->extradata_size < 2){ av_log(avctx, AV_LOG_ERROR, "Extradata is too small.\n"); return -1; diff --git a/libavcodec/rv40.c b/libavcodec/rv40.c index 3f2a824317..1d586d8395 100644 --- a/libavcodec/rv40.c +++ b/libavcodec/rv40.c @@ -541,9 +541,11 @@ static void rv40_loop_filter(RV34DecContext *r, int row) static av_cold int rv40_decode_init(AVCodecContext *avctx) { RV34DecContext *r = avctx->priv_data; + int ret; r->rv30 = 0; - ff_rv34_decode_init(avctx); + if ((ret = ff_rv34_decode_init(avctx)) < 0) + return ret; if(!aic_top_vlc.bits) rv40_init_tables(); r->parse_slice_header = rv40_parse_slice_header; |