From 4b5bd6c38ff98c4fb017e2ee819d0ecfe202bbff Mon Sep 17 00:00:00 2001 From: Matthias Hopf Date: Tue, 21 Nov 2006 17:40:10 +0000 Subject: Security fix addon to r5369 of mplayer svn. CVS patchset: 8385 CVS date: 2006/11/21 17:40:10 --- src/libffmpeg/libavcodec/alac.c | 5 ++++- src/libffmpeg/libavcodec/shorten.c | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/libffmpeg/libavcodec/alac.c b/src/libffmpeg/libavcodec/alac.c index 8bd75e5d9..5211e5057 100644 --- a/src/libffmpeg/libavcodec/alac.c +++ b/src/libffmpeg/libavcodec/alac.c @@ -470,7 +470,10 @@ static int alac_decode_frame(AVCodecContext *avctx, ALAC_EXTRADATA_SIZE); return input_buffer_size; } - alac_set_info(alac); + if (alac_set_info(alac)) { + av_log(NULL, AV_LOG_ERROR, "alac: set_info failed\n"); + return input_buffer_size; + } alac->context_initialized = 1; } diff --git a/src/libffmpeg/libavcodec/shorten.c b/src/libffmpeg/libavcodec/shorten.c index af1c3fe6e..fe956bc39 100644 --- a/src/libffmpeg/libavcodec/shorten.c +++ b/src/libffmpeg/libavcodec/shorten.c @@ -333,7 +333,8 @@ static int shorten_decode_frame(AVCodecContext *avctx, } s->nwrap = FFMAX(NWRAP, maxnlpc); - allocate_buffers(s); + if (allocate_buffers(s)) + return -1; init_offset(s); -- cgit v1.2.3