diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2014-08-08 18:07:43 +0200 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2014-08-09 04:01:15 +0200 |
| commit | 0ab76ddf313eeab70d06619ae0376fd7dd40761b (patch) | |
| tree | 5b9cc612dea64c831a020c831ddd998c709cb796 /libavcodec/shorten.c | |
| parent | 042c25f54bd25b52d2936b822be026450971a82d (diff) | |
| download | ffmpeg-0ab76ddf313eeab70d06619ae0376fd7dd40761b.tar.gz | |
avcodec: Introduce ff_get_buffer
Validate the image size there as is done in the other release
branches.
Bug-Id: CVE-2011-3935
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Diffstat (limited to 'libavcodec/shorten.c')
| -rw-r--r-- | libavcodec/shorten.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c index f96a003e75..2a127c50b9 100644 --- a/libavcodec/shorten.c +++ b/libavcodec/shorten.c @@ -28,6 +28,7 @@ #include <limits.h> #include "avcodec.h" +#include "internal.h" #include "bytestream.h" #include "get_bits.h" #include "golomb.h" @@ -598,7 +599,7 @@ static int shorten_decode_frame(AVCodecContext *avctx, void *data, if (s->cur_chan == s->channels) { /* get output buffer */ s->frame.nb_samples = s->blocksize; - if ((ret = avctx->get_buffer(avctx, &s->frame)) < 0) { + if ((ret = ff_get_buffer(avctx, &s->frame)) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return ret; } |