diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-21 22:03:24 +0200 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2011-04-26 09:40:06 +0200 |
| commit | eed5697f99927c78956fde6ee6f1ac87f3c6d261 (patch) | |
| tree | 5f891b0b622c0fa4adc20402366bca9ec873d288 | |
| parent | 52ee20f2aa2936e0fb0a90e81c39135a8f2394e9 (diff) | |
| download | ffmpeg-eed5697f99927c78956fde6ee6f1ac87f3c6d261.tar.gz | |
mjpeg: Detect overreads in mjpeg_decode_scan() and error out.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Ronald S. Bultje <rbultje@google.com>
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| -rw-r--r-- | libavcodec/mjpegdec.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 145719c16e..e5c9f38b93 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -784,6 +784,10 @@ static int mjpeg_decode_scan(MJpegDecodeContext *s, int nb_components, int Ah, i if (s->restart_interval && !s->restart_count) s->restart_count = s->restart_interval; + if(get_bits_count(&s->gb)>s->gb.size_in_bits){ + av_log(s->avctx, AV_LOG_ERROR, "overread %d\n", get_bits_count(&s->gb) - s->gb.size_in_bits); + return -1; + } for(i=0;i<nb_components;i++) { uint8_t *ptr; int n, h, v, x, y, c, j; |