Merge pull request #964 from sigiesec/fix-ubsan-resetStreamHC_fast

Don't trigger UBSan warning in LZ4_resetStreamHC_fast if LZ4_streamHC…
lz4 · Jan 19, 2021 · a8e8887 · a8e8887
2 parents cbd186e + 06b07e1
commit a8e8887
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/lib/lz4hc.c b/lib/lz4hc.c
@@ -1031,7 +1031,11 @@ void LZ4_resetStreamHC_fast (LZ4_streamHC_t* LZ4_streamHCPtr, int compressionLev
         LZ4_initStreamHC(LZ4_streamHCPtr, sizeof(*LZ4_streamHCPtr));
     } else {
         /* preserve end - base : can trigger clearTable's threshold */
-        LZ4_streamHCPtr->internal_donotuse.end -= (uptrval)LZ4_streamHCPtr->internal_donotuse.base;
+        if (LZ4_streamHCPtr->internal_donotuse.end != NULL) {
+            LZ4_streamHCPtr->internal_donotuse.end -= (uptrval)LZ4_streamHCPtr->internal_donotuse.base;
+        } else {
+            assert(LZ4_streamHCPtr->internal_donotuse.base == NULL);
+        }
         LZ4_streamHCPtr->internal_donotuse.base = NULL;
         LZ4_streamHCPtr->internal_donotuse.dictCtx = NULL;
     }