Skip to content

Switch to smart_str API #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kjdev merged 1 commit into from
May 27, 2026
Merged

Switch to smart_str API #95

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 38 additions & 36 deletions zstd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,10 @@
#include <ext/standard/base64.h>
#include <ext/standard/file.h>
#include <ext/standard/info.h>
#if PHP_VERSION_ID < 70200
#include <ext/standard/php_smart_string.h>
#else
#include "Zend/zend_smart_string.h"
#endif
#include <zend_smart_str.h>
#if defined(HAVE_APCU_SUPPORT)
#include <ext/standard/php_var.h>
#include <ext/apcu/apc_serializer.h>
#include <zend_smart_str.h>
#endif
#include <Zend/zend_API.h>
#include <Zend/zend_interfaces.h>
Expand All @@ -65,6 +60,19 @@
#define zend_string_efree(string) zend_string_free(string)
#endif

#if PHP_VERSION_ID < 70200
static zend_always_inline zend_string *smart_str_extract(smart_str *str) {
if (str->s) {
smart_str_0(str);
zend_string *res = str->s;
str->s = NULL;
return res;
} else {
return ZSTR_EMPTY_ALLOC();
}
}
#endif

#define ZSTD_WARNING(...) \
php_error_docref(NULL, E_WARNING, __VA_ARGS__)

Expand Down Expand Up @@ -448,7 +456,7 @@ static size_t zstd_check_compress_level(zend_long level)
ZEND_FUNCTION(zstd_compress)
{
size_t result;
smart_string out = { 0 };
smart_str out = { 0 };
zend_long level = ZSTD_CLEVEL_DEFAULT;
zend_string *input, *dict = NULL;
php_zstd_context ctx;
Expand Down Expand Up @@ -480,15 +488,14 @@ ZEND_FUNCTION(zstd_compress)
&ctx.input, ZSTD_e_end);
if (ZSTD_isError(result)) {
ZSTD_WARNING("%s", ZSTD_getErrorName(result));
smart_string_free(&out);
smart_str_free(&out);
php_zstd_context_free(&ctx);
RETURN_FALSE;
}
smart_string_appendl(&out, ctx.output.dst, ctx.output.pos);
smart_str_appendl(&out, ctx.output.dst, ctx.output.pos);
} while (result > 0);

RETVAL_STRINGL(out.c, out.len);
smart_string_free(&out);
RETVAL_STR(smart_str_extract(&out));

php_zstd_context_free(&ctx);
}
Expand All @@ -497,7 +504,7 @@ ZEND_FUNCTION(zstd_uncompress)
{
size_t chunk, result;
uint64_t size;
smart_string out = { 0 };
smart_str out = { 0 };
zend_string *input, *dict = NULL;
php_zstd_context ctx;

Expand Down Expand Up @@ -540,29 +547,28 @@ ZEND_FUNCTION(zstd_uncompress)
ctx.output.pos = 0;
result = ZSTD_decompressStream(ctx.dctx, &ctx.output, &ctx.input);
if (ZSTD_IS_ERROR(result)) {
smart_string_free(&out);
smart_str_free(&out);
php_zstd_context_free(&ctx);
ZSTD_WARNING("%s", ZSTD_getErrorName(result));
RETURN_FALSE;
}

smart_string_appendl(&out, ctx.output.dst, ctx.output.pos);
smart_str_appendl(&out, ctx.output.dst, ctx.output.pos);

if (result == 0) {
break;
}
}

RETVAL_STRINGL(out.c, out.len);
smart_string_free(&out);
RETVAL_STR(smart_str_extract(&out));

php_zstd_context_free(&ctx);
}

ZEND_FUNCTION(zstd_compress_dict)
{
size_t result;
smart_string out = { 0 };
smart_str out = { 0 };
zend_long level = ZSTD_CLEVEL_DEFAULT;
zend_string *input, *dict;
php_zstd_context ctx;
Expand Down Expand Up @@ -596,15 +602,14 @@ ZEND_FUNCTION(zstd_compress_dict)
&ctx.input, ZSTD_e_end);
if (ZSTD_isError(result)) {
ZSTD_WARNING("%s", ZSTD_getErrorName(result));
smart_string_free(&out);
smart_str_free(&out);
php_zstd_context_free(&ctx);
RETURN_FALSE;
}
smart_string_appendl(&out, ctx.output.dst, ctx.output.pos);
smart_str_appendl(&out, ctx.output.dst, ctx.output.pos);
} while (result > 0);

RETVAL_STRINGL(out.c, out.len);
smart_string_free(&out);
RETVAL_STR(smart_str_extract(&out));

php_zstd_context_free(&ctx);
}
Expand All @@ -613,7 +618,7 @@ ZEND_FUNCTION(zstd_uncompress_dict)
{
size_t chunk, result;
unsigned long long size;
smart_string out = { 0 };
smart_str out = { 0 };
zend_string *input, *dict;
php_zstd_context ctx;

Expand Down Expand Up @@ -659,21 +664,20 @@ ZEND_FUNCTION(zstd_uncompress_dict)
ctx.output.pos = 0;
result = ZSTD_decompressStream(ctx.dctx, &ctx.output, &ctx.input);
if (ZSTD_IS_ERROR(result)) {
smart_string_free(&out);
smart_str_free(&out);
php_zstd_context_free(&ctx);
ZSTD_WARNING("%s", ZSTD_getErrorName(result));
RETURN_FALSE;
}

smart_string_appendl(&out, ctx.output.dst, ctx.output.pos);
smart_str_appendl(&out, ctx.output.dst, ctx.output.pos);

if (result == 0) {
break;
}
}

RETVAL_STRINGL(out.c, out.len);
smart_string_free(&out);
RETVAL_STR(smart_str_extract(&out));

php_zstd_context_free(&ctx);
}
Expand Down Expand Up @@ -706,7 +710,7 @@ ZEND_FUNCTION(zstd_compress_add)
php_zstd_context *ctx;
zend_string *input;
zend_bool end = 0;
smart_string out = {0};
smart_str out = {0};
#if PHP_VERSION_ID >= 80000
zend_object *obj;
#else
Expand Down Expand Up @@ -743,14 +747,13 @@ ZEND_FUNCTION(zstd_compress_add)
&in, end ? ZSTD_e_end : ZSTD_e_flush);
if (ZSTD_isError(res)) {
ZSTD_WARNING("%s", ZSTD_getErrorName(res));
smart_string_free(&out);
smart_str_free(&out);
RETURN_FALSE;
}
smart_string_appendl(&out, ctx->output.dst, ctx->output.pos);
smart_str_appendl(&out, ctx->output.dst, ctx->output.pos);
} while (res > 0);

RETVAL_STRINGL(out.c, out.len);
smart_string_free(&out);
RETVAL_STR(smart_str_extract(&out));
}

ZEND_FUNCTION(zstd_uncompress_init)
Expand All @@ -775,7 +778,7 @@ ZEND_FUNCTION(zstd_uncompress_add)
zend_object *context;
php_zstd_context *ctx;
zend_string *input;
smart_string out = {0};
smart_str out = {0};
#if PHP_VERSION_ID >= 80000
zend_object *obj;
#else
Expand Down Expand Up @@ -815,15 +818,14 @@ ZEND_FUNCTION(zstd_uncompress_add)
res = ZSTD_decompressStream(ctx->dctx, &ctx->output, &in);
if (ZSTD_isError(res)) {
ZSTD_WARNING("%s", ZSTD_getErrorName(res));
smart_string_free(&out);
smart_str_free(&out);
RETURN_FALSE;
}

smart_string_appendl(&out, ctx->output.dst, ctx->output.pos);
smart_str_appendl(&out, ctx->output.dst, ctx->output.pos);
}

RETVAL_STRINGL(out.c, out.len);
smart_string_free(&out);
RETVAL_STR(smart_str_extract(&out));
}

typedef struct _php_zstd_stream_data {
Expand Down
Loading