[FFmpeg-cvslog] mjpegdec: check buffer before using it

Michael Niedermayer git at videolan.org
Fri Mar 29 05:09:43 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar 29 04:36:49 2013 +0100| [aa28c42534383ae1e2055d66a49c009e8234d18f] | committer: Michael Niedermayer

mjpegdec: check buffer before using it

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/mjpegdec.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 5880fec..b9fe555 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -1656,8 +1656,10 @@ int ff_mjpeg_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
         } else {
             av_log(avctx, AV_LOG_DEBUG, "marker=%x avail_size_in_buf=%td\n",
                    start_code, buf_end - buf_ptr);
-
-            init_get_bits(&s->gb, unescaped_buf_ptr, unescaped_buf_size * 8);
+            if ((ret = init_get_bits8(&s->gb, unescaped_buf_ptr, unescaped_buf_size)) < 0) {
+                av_log(avctx, AV_LOG_ERROR, "invalid buffer\n");
+                goto fail;
+            }
 
             s->start_code = start_code;
             if (s->avctx->debug & FF_DEBUG_STARTCODE)



More information about the ffmpeg-cvslog mailing list