diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-11 18:08:39 +0100 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2014-01-07 09:43:56 +0100 |
| commit | b81d804f2ac113a46d1736751401d78f998db56d (patch) | |
| tree | d1530e0c59402023132c8d99717cc731eda3ef9d | |
| parent | f241d5aa1fa45d98c26accd0832c354e7ec64e5a (diff) | |
| download | ffmpeg-b81d804f2ac113a46d1736751401d78f998db56d.tar.gz | |
zmbvdec: Check the buffer size for uncompressed data
Also don't pointlessly set the buffer size to 1 after copying
one packet.
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 0d61f260010707f3028b818e8b24598e1a83d696)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| -rw-r--r-- | libavcodec/zmbv.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c index a36a844b1f..9df0d53525 100644 --- a/libavcodec/zmbv.c +++ b/libavcodec/zmbv.c @@ -497,8 +497,11 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac } if (c->comp == 0) { //Uncompressed data + if (c->decomp_size < len) { + av_log(avctx, AV_LOG_ERROR, "Buffer too small\n"); + return AVERROR_INVALIDDATA; + } memcpy(c->decomp_buf, buf, len); - c->decomp_size = 1; } else { // ZLIB-compressed data c->zstream.total_in = c->zstream.total_out = 0; c->zstream.next_in = buf; |