Merge pull request #3263 from daniellerozenblit/null-buffer-decompress

ZSTD_decompressStream() fuzz fix
2022-09-13 10:07:35 -04:00
parent 484b9d67c6 8bb833bb5a
commit cb6dc32635
1 changed files with 3 additions and 3 deletions
@@ -2177,11 +2177,11 @@ size_t ZSTD_decompressStream(ZSTD_DStream* zds, ZSTD_outBuffer* output, ZSTD_inB
                break;
            }
        case zdss_flush:
-            if (op != NULL) {
+            {
                size_t const toFlushSize = zds->outEnd - zds->outStart;
                size_t const flushedSize = ZSTD_limitCopy(op, (size_t)(oend-op), zds->outBuff + zds->outStart, toFlushSize);

-                op += flushedSize;
+                op = op ? op + flushedSize : op;

                zds->outStart += flushedSize;
                if (flushedSize == toFlushSize) {  /* flush completed */