summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorYann Collet <yann.collet.73@gmail.com>2019-04-18 23:06:02 (GMT)
committerYann Collet <yann.collet.73@gmail.com>2019-04-18 23:07:16 (GMT)
commit0b876db6d42ec22da0c635e97a0d690908f2104a (patch)
tree2ee943a56f12698153a5e0c305a65a2f7016ad7a /lib
parent5a6d72447ae998b387794df1135023689aa89995 (diff)
downloadlz4-0b876db6d42ec22da0c635e97a0d690908f2104a.zip
lz4-0b876db6d42ec22da0c635e97a0d690908f2104a.tar.gz
lz4-0b876db6d42ec22da0c635e97a0d690908f2104a.tar.bz2
address a few minor Visual warnings
and created target cxx17build
Diffstat (limited to 'lib')
-rw-r--r--lib/lz4.h8
-rw-r--r--lib/lz4hc.c1
2 files changed, 6 insertions, 3 deletions
diff --git a/lib/lz4.h b/lib/lz4.h
index 962f5e6..737a0c7 100644
--- a/lib/lz4.h
+++ b/lib/lz4.h
@@ -638,9 +638,11 @@ LZ4_DEPRECATED("use LZ4_decompress_fast_usingDict() instead") LZ4LIB_API int LZ4
* On top of that `LZ4_decompress_fast()` is not protected vs malformed or malicious inputs, making it a security liability.
* As a consequence, LZ4_decompress_fast() is strongly discouraged, and deprecated.
*
- * Only LZ4_decompress_fast() specificity is that it can decompress a block without knowing its compressed size.
- * Even that functionality could be achieved in a more secure manner if need be,
- * though it would require new prototypes, and adaptation of the implementation to this new use case.
+ * The last remaining LZ4_decompress_fast() specificity is that
+ * it can decompress a block without knowing its compressed size.
+ * Such functionality could be achieved in a more secure manner,
+ * by also providing the maximum size of input buffer,
+ * but it would require new prototypes, and adaptation of the implementation to this new use case.
*
* Parameters:
* originalSize : is the uncompressed size to regenerate.
diff --git a/lib/lz4hc.c b/lib/lz4hc.c
index d5f6743..031df8f 100644
--- a/lib/lz4hc.c
+++ b/lib/lz4hc.c
@@ -1396,6 +1396,7 @@ static int LZ4HC_compress_optimal ( LZ4HC_CCtx_internal* ctx,
} }
} /* for (cur = 1; cur <= last_match_pos; cur++) */
+ assert(last_match_pos < LZ4_OPT_NUM + TRAILING_LITERALS);
best_mlen = opt[last_match_pos].mlen;
best_off = opt[last_match_pos].off;
cur = last_match_pos - best_mlen;