From: Yann Collet <yann.collet.73@gmail.com>
Date: Wed, 2 Jul 2014 03:36:56 +0000 (+0100)
Subject: Quickfix of issue 134 (untested)
X-Git-Tag: upstream/1.9.3~261^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1411c2b6740b92cbe258465a20f43e8de6098a8f;p=platform%2Fupstream%2Flz4.git

Quickfix of issue 134 (untested)
---

diff --git a/Makefile b/Makefile
index 9fcc4a9..b6343a7 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@
 # ################################################################
 
 # Version numbers
-export RELEASE=r118
+export RELEASE=rc119
 LIBVER_MAJOR=1
 LIBVER_MINOR=2
 LIBVER_PATCH=0
diff --git a/lz4.c b/lz4.c
index a1475dc..c0b6c1a 100644
--- a/lz4.c
+++ b/lz4.c
@@ -922,7 +922,9 @@ FORCE_INLINE int LZ4_decompress_generic(
                 length += s;
             }
             while (likely((endOnInput)?ip<iend-RUN_MASK:1) && (s==255));
-            if ((sizeof(void*)==4) && unlikely(length>LZ4_MAX_INPUT_SIZE)) goto _output_error;   /* overflow detection */
+            //if ((sizeof(void*)==4) && unlikely(length>LZ4_MAX_INPUT_SIZE)) goto _output_error;   /* overflow detection */
+            if ((sizeof(void*)==4) && unlikely(op+length<op)) goto _output_error;   /* quickfix issue 134 */
+            if (endOnInput && (sizeof(void*)==4) && unlikely(ip+length<ip)) goto _output_error;   /* quickfix issue 134 */
         }
 
         /* copy literals */
@@ -961,7 +963,8 @@ FORCE_INLINE int LZ4_decompress_generic(
                 s = *ip++;
                 length += s;
             } while (s==255);
-            if ((sizeof(void*)==4) && unlikely(length>LZ4_MAX_INPUT_SIZE)) goto _output_error;   /* overflow detection */
+            //if ((sizeof(void*)==4) && unlikely(length>LZ4_MAX_INPUT_SIZE)) goto _output_error;   /* overflow detection */
+            if ((sizeof(void*)==4) && unlikely(op+length<op)) goto _output_error;   /* quickfix issue 134 */
         }
 
         /* check external dictionary */