summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYann Collet <cyan@fb.com>2016-11-14 22:38:46 (GMT)
committerYann Collet <cyan@fb.com>2016-11-14 22:38:46 (GMT)
commitf094f531441140f10fd461ba769f49d10f5cd581 (patch)
treea06c3bb1ca75c55f2b1edfc6a90ed2be0f530e39
parent0fe5c187a5fe95f5c129b1eda8d743b485fc6ff5 (diff)
downloadlz4-f094f531441140f10fd461ba769f49d10f5cd581.zip
lz4-f094f531441140f10fd461ba769f49d10f5cd581.tar.gz
lz4-f094f531441140f10fd461ba769f49d10f5cd581.tar.bz2
silence a minor msan warning
-rw-r--r--lib/lz4.c1
-rw-r--r--programs/lz4io.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/lz4.c b/lib/lz4.c
index e6b70bc..ff141be 100644
--- a/lib/lz4.c
+++ b/lib/lz4.c
@@ -1168,6 +1168,7 @@ FORCE_INLINE int LZ4_decompress_generic(
offset = LZ4_readLE16(ip); ip+=2;
match = op - offset;
if ((checkOffset) && (unlikely(match < lowLimit))) goto _output_error; /* Error : offset outside buffers */
+ LZ4_write32(op, offset); /* costs ~1%; silence an msan warning when offset==0 */
/* get matchlength */
length = token & ML_MASK;
diff --git a/programs/lz4io.c b/programs/lz4io.c
index 00576c2..5a366a4 100644
--- a/programs/lz4io.c
+++ b/programs/lz4io.c
@@ -824,7 +824,8 @@ static unsigned long long LZ4IO_decompressLZ4F(dRess_t ress, FILE* srcFile, FILE
/* Write Block */
if (decodedBytes) {
- if (!g_testMode) storedSkips = LZ4IO_fwriteSparse(dstFile, ress.dstBuffer, decodedBytes, storedSkips);
+ if (!g_testMode)
+ storedSkips = LZ4IO_fwriteSparse(dstFile, ress.dstBuffer, decodedBytes, storedSkips);
filesize += decodedBytes;
DISPLAYUPDATE(2, "\rDecompressed : %u MB ", (unsigned)(filesize>>20));
}