From 80a50991069fa264980d072626252bcdb219c1e8 Mon Sep 17 00:00:00 2001
From: kjdev <kjclev@gmail.com>
Date: Fri, 23 May 2025 12:55:32 +0900
Subject: [PATCH 1/2] fix: streaming compressed data with
 zstd_uncompress_dict()

---
 zstd.c | 97 +++++++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 73 insertions(+), 24 deletions(-)

diff --git a/zstd.c b/zstd.c
index 9c9fc86..1e6d4c2 100644
--- a/zstd.c
+++ b/zstd.c
@@ -543,51 +543,100 @@ ZEND_FUNCTION(zstd_uncompress_dict)
     char *input, *dict;
     size_t input_len, dict_len;
     zend_string *output;
+    uint8_t streaming = 0;
+    size_t result;
+    unsigned long long size;
+    ZSTD_DCtx *dctx;
+    ZSTD_DDict *ddict;
 
     ZEND_PARSE_PARAMETERS_START(2, 2)
         Z_PARAM_STRING(input, input_len)
         Z_PARAM_STRING(dict, dict_len)
     ZEND_PARSE_PARAMETERS_END();
 
-    unsigned long long const rSize = ZSTD_getFrameContentSize(input,
-                                                              input_len);
-
-    if (rSize == 0 || rSize == ZSTD_CONTENTSIZE_ERROR) {
+    size = ZSTD_getFrameContentSize(input, input_len);
+    if (size == 0) {
+        RETURN_EMPTY_STRING();
+    } else if (size == ZSTD_CONTENTSIZE_ERROR) {
         ZSTD_WARNING("it was not compressed by zstd");
         RETURN_FALSE;
+    } else if (size == ZSTD_CONTENTSIZE_UNKNOWN) {
+        streaming = 1;
+        size = input_len + ZSTD_DStreamOutSize();
     }
 
-    ZSTD_DCtx* const dctx = ZSTD_createDCtx();
+    dctx = ZSTD_createDCtx();
     if (dctx == NULL) {
-        ZSTD_WARNING("ZSTD_createDCtx() error");
+        ZSTD_WARNING("failed to prepare uncompression");
         RETURN_FALSE;
     }
-    ZSTD_DDict* const ddict = ZSTD_createDDict(dict,
-                                               dict_len);
+    ddict = ZSTD_createDDict(dict, dict_len);
     if (!ddict) {
-        ZSTD_freeDStream(dctx);
-        ZSTD_WARNING("ZSTD_createDDict() error");
+        ZSTD_freeDCtx(dctx);
+        ZSTD_WARNING("failed to load dictionary");
         RETURN_FALSE;
     }
 
-    output = zend_string_alloc(rSize, 0);
+    output = zend_string_alloc(size, 0);
 
-    size_t const dSize = ZSTD_decompress_usingDDict(dctx, ZSTR_VAL(output), rSize,
-                                                    input,
-                                                    input_len,
-                                                    ddict);
-    if (dSize != rSize) {
-        ZSTD_freeDStream(dctx);
-        ZSTD_freeDDict(ddict);
-        zend_string_efree(output);
-        ZSTD_WARNING("%s", ZSTD_getErrorName(dSize));
-        RETURN_FALSE;
+    if (!streaming) {
+        result = ZSTD_decompress_usingDDict(dctx, ZSTR_VAL(output), size,
+                                            input, input_len, ddict);
+        if (ZSTD_IS_ERROR(result)) {
+            zend_string_efree(output);
+            ZSTD_WARNING("%s", ZSTD_getErrorName(result));
+            RETVAL_FALSE;
+        } else if (result != size) {
+            zend_string_efree(output);
+            ZSTD_WARNING("failed to uncompress");
+            RETVAL_FALSE;
+        } else {
+            output = zstd_string_output_truncate(output, result);
+            RETVAL_NEW_STR(output);
+        }
+    } else {
+        ZSTD_inBuffer in = { NULL, 0, 0 };
+        ZSTD_outBuffer out = { NULL, 0, 0 };
+        size_t chunk = ZSTD_DStreamOutSize();
+
+        ZSTD_DCtx_reset(dctx, ZSTD_reset_session_only);
+        ZSTD_DCtx_refDDict(dctx, ddict);
+
+        in.src = input;
+        in.size = input_len;
+        in.pos = 0;
+
+        out.dst = ZSTR_VAL(output);
+        out.size = size;
+        out.pos = 0;
+
+        while (in.pos < in.size) {
+            if (out.pos == out.size) {
+                out.size += chunk;
+                output = zend_string_extend(output, out.size, 0);
+                out.dst = ZSTR_VAL(output);
+            }
+
+            result = ZSTD_decompressStream(dctx, &out, &in);
+            if (ZSTD_IS_ERROR(result)) {
+                zend_string_efree(output);
+                ZSTD_freeDCtx(dctx);
+                ZSTD_freeDDict(ddict);
+                ZSTD_WARNING("%s", ZSTD_getErrorName(result));
+                RETURN_FALSE;
+            }
+
+            if (result == 0) {
+                break;
+            }
+        }
+
+        output = zstd_string_output_truncate(output, out.pos);
+        RETVAL_NEW_STR(output);
     }
+
     ZSTD_freeDCtx(dctx);
     ZSTD_freeDDict(ddict);
-
-    output = zstd_string_output_truncate(output, dSize);
-    RETVAL_NEW_STR(output);
 }
 
 ZEND_FUNCTION(zstd_compress_init)

From 8ed886572a135f430333f50486fe7768f91dde8f Mon Sep 17 00:00:00 2001
From: kjdev <kjclev@gmail.com>
Date: Fri, 23 May 2025 13:01:00 +0900
Subject: [PATCH 2/2] test: add streaming compressed data with
 zstd_uncompress_dict()

---
 tests/dictionary_02.phpt | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 tests/dictionary_02.phpt

diff --git a/tests/dictionary_02.phpt b/tests/dictionary_02.phpt
new file mode 100644
index 0000000..f4faa68
--- /dev/null
+++ b/tests/dictionary_02.phpt
@@ -0,0 +1,33 @@
+--TEST--
+zstd_uncompress_dict(): streaming decompression with dictionary
+--SKIPIF--
+<?php
+if (LIBZSTD_VERSION_NUMBER < 10304) die("skip needs libzstd 1.3.4");
+?>
+--FILE--
+<?php
+include(dirname(__FILE__) . '/data.inc');
+$dictionary = file_get_contents(dirname(__FILE__) . '/data.dic');
+
+$context = stream_context_create(
+    array(
+        'zstd' => array(
+            'dict'  => $dictionary
+        )
+    )
+);
+
+$file = dirname(__FILE__) . '/data_' . basename(__FILE__, ".php") . '.out';
+file_put_contents('compress.zstd://' . $file, $data, 0, $context);
+$enc = file_get_contents($file);
+
+$dec  = zstd_uncompress_dict($enc, $dictionary);
+
+var_dump($data === $dec);
+
+@unlink($file);
+?>
+===Done===
+--EXPECTF--
+bool(true)
+===Done===