Remove boundary checks that are actually done "well enough"
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>
Wed, 31 Jan 2007 20:57:30 +0000 (20:57 +0000)
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>
Wed, 31 Jan 2007 20:57:30 +0000 (20:57 +0000)
in copy function

Originally committed as revision 7786 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/lzo.c

index ec919c2a95e6c1db450a80cb60d2b703ccff7cfa..c78e1f364cc3f9af1bd6afe887b4e210a60a9f11 100644 (file)
@@ -213,10 +213,6 @@ int lzo1x_decode(void *out, int *outlen, void *in, int *inlen) {
                 cnt = get_len(&c, x, 15);
                 copy(&c, cnt + 3);
                 x = GETB(c);
-                if (c.in > c.in_end) {
-                    c.error |= LZO_INPUT_DEPLETED;
-                    continue;
-                }
                 if (x > 15)
                     continue;
                 cnt = 1;
@@ -228,11 +224,8 @@ int lzo1x_decode(void *out, int *outlen, void *in, int *inlen) {
         copy_backptr(&c, back, cnt + 2);
         state=
         cnt = x & 3;
-        if (cnt)
-            copy(&c, cnt);
+        copy(&c, cnt);
         x = GETB(c);
-        if (c.in > c.in_end)
-            c.error |= LZO_INPUT_DEPLETED;
     }
     *inlen = c.in_end - c.in;
     if (c.in > c.in_end)