[FFmpeg-cvslog] rawdec: only exempt BIT0 with need_copy from buffer sanity check

Andreas Cadhalpun git at videolan.org
Sun Dec 20 03:06:53 CET 2015


ffmpeg | branch: release/2.8 | Andreas Cadhalpun <andreas.cadhalpun at googlemail.com> | Sat Dec 19 23:49:14 2015 +0100| [9be3441c311c8b09fe3af38169a3ad4c5cb5cac8] | committer: Michael Niedermayer

rawdec: only exempt BIT0 with need_copy from buffer sanity check

Otherwise the too samll buffer is directly used in the frame, causing
segmentation faults, when trying to use the frame.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9be3441c311c8b09fe3af38169a3ad4c5cb5cac8
---

 libavcodec/rawdec.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c
index d8d77fc..af764ab 100644
--- a/libavcodec/rawdec.c
+++ b/libavcodec/rawdec.c
@@ -258,7 +258,7 @@ static int raw_decode(AVCodecContext *avctx, void *data, int *got_frame,
         buf += buf_size - context->frame_size;
 
     len = context->frame_size - (avctx->pix_fmt==AV_PIX_FMT_PAL8 ? AVPALETTE_SIZE : 0);
-    if (buf_size < len && (avctx->codec_tag & 0xFFFFFF) != MKTAG('B','I','T', 0)) {
+    if (buf_size < len && ((avctx->codec_tag & 0xFFFFFF) != MKTAG('B','I','T', 0) || !need_copy)) {
         av_log(avctx, AV_LOG_ERROR, "Invalid buffer size, packet size %d < expected frame_size %d\n", buf_size, len);
         av_buffer_unref(&frame->buf[0]);
         return AVERROR(EINVAL);



More information about the ffmpeg-cvslog mailing list