[FFmpeg-cvslog] tiffdec: Fix runend handling

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec 24 04:35:12 2012 +0100| [98b7a50a2100e3dad96821d2c0adac369652707d] | committer: Michael Niedermayer

tiffdec: Fix runend handling

Fixes Ticket1999

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

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

 libavcodec/faxcompr.c |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/libavcodec/faxcompr.c b/libavcodec/faxcompr.c
index e7f9d00..3e51a3e 100644
--- a/libavcodec/faxcompr.c
+++ b/libavcodec/faxcompr.c
@@ -163,8 +163,6 @@ static int decode_group3_2d_line(AVCodecContext *avctx, GetBitContext *gb,
     int run_off = *ref++;
     unsigned int offs=0, run= 0;
 
-    runend--; // for the last written 0
-
     while(offs < width){
         int cmode = get_vlc2(gb, ccitt_group3_2d_vlc.table, 9, 1);
         if(cmode == -1){
@@ -234,7 +232,13 @@ static int decode_group3_2d_line(AVCodecContext *avctx, GetBitContext *gb,
         }
     }
     *runs++ = saved_run;
-    *runs++ = 0;
+    if (saved_run) {
+        if(runs >= runend){
+            av_log(avctx, AV_LOG_ERROR, "Run overrun\n");
+            return -1;
+        }
+        *runs++ = 0;
+    }
     return 0;
 }