summaryrefslogtreecommitdiffstats
path: root/lib/lz4.c
diff options
context:
space:
mode:
authorYann Collet <yann.collet.73@gmail.com>2016-06-29 15:48:28 (GMT)
committerYann Collet <yann.collet.73@gmail.com>2016-06-29 15:48:28 (GMT)
commit6b1600f41e039639b24f7780db8f1c26b28b1b6b (patch)
treeac06a2ca2a070833a9c48d02326a6b9e740264d6 /lib/lz4.c
parent6923f3e2306fc08431a0f9e78c6e6d1177905fc2 (diff)
downloadlz4-6b1600f41e039639b24f7780db8f1c26b28b1b6b.zip
lz4-6b1600f41e039639b24f7780db8f1c26b28b1b6b.tar.gz
lz4-6b1600f41e039639b24f7780db8f1c26b28b1b6b.tar.bz2
changed : default benchmark LZ4_decompress_safe()
Diffstat (limited to 'lib/lz4.c')
-rw-r--r--lib/lz4.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/lib/lz4.c b/lib/lz4.c
index 683fde6..77fd628 100644
--- a/lib/lz4.c
+++ b/lib/lz4.c
@@ -1,6 +1,6 @@
/*
LZ4 - Fast LZ compression algorithm
- Copyright (C) 2011-2015, Yann Collet.
+ Copyright (C) 2011-2016, Yann Collet.
BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
@@ -28,8 +28,8 @@
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
You can contact the author at :
- - LZ4 source repository : https://github.com/Cyan4973/lz4
- - LZ4 public forum : https://groups.google.com/forum/#!forum/lz4c
+ - LZ4 homepage : http://www.lz4.org
+ - LZ4 source repository : https://github.com/Cyan4973/lz4
*/
@@ -1153,8 +1153,8 @@ FORCE_INLINE int LZ4_decompress_generic(
/* copy literals */
cpy = op+length;
- if (((endOnInput) && ((cpy>(partialDecoding?oexit:oend-MFLIMIT)) || (ip+length>iend-(2+1+LASTLITERALS))) )
- || ((!endOnInput) && (cpy>oend-WILDCOPYLENGTH)))
+ if ( ((endOnInput) && ((cpy>(partialDecoding?oexit:oend-MFLIMIT)) || (ip+length>iend-(2+1+LASTLITERALS))) )
+ || ((!endOnInput) && (cpy>oend-WILDCOPYLENGTH)) )
{
if (partialDecoding) {
if (cpy > oend) goto _output_error; /* Error : write attempt beyond end of output buffer */
@@ -1210,8 +1210,7 @@ FORCE_INLINE int LZ4_decompress_generic(
} else {
memcpy(op, lowPrefix, restSize);
op += restSize;
- }
- }
+ } }
continue;
}