diff options
| author | Yann Collet <yann.collet.73@gmail.com> | 2014-07-02 03:36:56 (GMT) |
|---|---|---|
| committer | Yann Collet <yann.collet.73@gmail.com> | 2014-07-02 03:36:56 (GMT) |
| commit | 1411c2b6740b92cbe258465a20f43e8de6098a8f (patch) | |
| tree | 88e6469c3f174452257e91f415e180851a2103af | |
| parent | 93e589caad5503326bec3a4085ec797940eed94d (diff) | |
| download | lz4-1411c2b6740b92cbe258465a20f43e8de6098a8f.zip lz4-1411c2b6740b92cbe258465a20f43e8de6098a8f.tar.gz lz4-1411c2b6740b92cbe258465a20f43e8de6098a8f.tar.bz2 | |
Quickfix of issue 134 (untested)
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | lz4.c | 7 |
2 files changed, 6 insertions, 3 deletions
@@ -31,7 +31,7 @@ # ################################################################ # Version numbers -export RELEASE=r118 +export RELEASE=rc119 LIBVER_MAJOR=1 LIBVER_MINOR=2 LIBVER_PATCH=0 @@ -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 */ |