diff options
| author | Matthias Hopf <mat@mshopf.de> | 2006-11-22 01:11:29 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2006-11-22 01:11:29 +0000 |
| commit | 1e25a7e7ebb55516d522a8ab1c4b7938b5060fe5 (patch) | |
| tree | b2377a56c13f1577aae40df7e83886eb9e8ef80f | |
| parent | ba2433e9f5d8535da319f07fadd82db9d5ddbb17 (diff) | |
| download | ffmpeg-1e25a7e7ebb55516d522a8ab1c4b7938b5060fe5.tar.gz | |
fix some potential security issues, patch by Matthias Hopf, mat at mshopf dot de
Originally committed as revision 7153 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/alac.c | 5 | ||||
| -rw-r--r-- | libavcodec/shorten.c | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/libavcodec/alac.c b/libavcodec/alac.c index d6386b40e0..793f71a11f 100644 --- a/libavcodec/alac.c +++ b/libavcodec/alac.c @@ -472,7 +472,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(avctx, AV_LOG_ERROR, "alac: set_info failed\n"); + return input_buffer_size; + } alac->context_initialized = 1; } diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c index bf5a093a88..358ecf23f6 100644 --- a/libavcodec/shorten.c +++ b/libavcodec/shorten.c @@ -335,7 +335,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); |