Skip to content

Use add_assoc_zval_ex #7

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
yordadev merged 15 commits into from
Jan 14, 2026
Merged

Use add_assoc_zval_ex #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
ef6a23a
Fix double-free heap corruption and memory leak in PHP 8.5.3-dev
yordadev Jan 11, 2026
ec623b8
heap error fix and build improvements
yordadev Jan 11, 2026
135b477
Merge branch 'main' into patch-main-php-85-heap-corruption-error
yordadev Jan 11, 2026
5e77f43
heap fixes 🔥
yordadev Jan 12, 2026
fd3ee5d
Fix attempt for heap corruption
yordadev Jan 12, 2026
188e7a1
Update request.c
yordadev Jan 12, 2026
f133b4d
👀
yordadev Jan 12, 2026
e30632e
Merge branch 'main' into patch-main-php-85-heap-corruption-error
yordadev Jan 12, 2026
bc2ff5f
Update request.c
yordadev Jan 13, 2026
6a3a775
docker & makefile improvements
yordadev Jan 13, 2026
4164297
Update Dockerfile.valgrind
yordadev Jan 13, 2026
768bf87
use add_assoc_zval_ex
yordadev Jan 14, 2026
466fd0d
build with with ASan
yordadev Jan 14, 2026
3a1d5b4
Merge branch 'main' into patch-main-php-85-heap-corruption-error
yordadev Jan 14, 2026
801b76c
ASan conflicts with valgrind - cannot run both together.
yordadev Jan 14, 2026
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
8 changes: 5 additions & 3 deletions src/request.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ static void signalforge_request_free_object(zend_object *object)
if (!Z_ISUNDEF(intern->zv_method_override_post)) zval_ptr_dtor(&intern->zv_method_override_post);
if (!Z_ISUNDEF(intern->zv_uri)) zval_ptr_dtor(&intern->zv_uri);
if (!Z_ISUNDEF(intern->zv_query_string)) zval_ptr_dtor(&intern->zv_query_string);

/* Free owned HashTables */
if (intern->ht_headers) {
zend_hash_destroy(intern->ht_headers);
Expand Down Expand Up @@ -977,7 +977,7 @@ PHP_METHOD(Signalforge_Http_Request, getHeaders)
{
signalforge_request_object *intern = Z_SIGNALFORGE_REQUEST_P(ZEND_THIS);
ZEND_PARSE_PARAMETERS_NONE();

if (intern->ht_headers) {
/* Convert HashTable to array, ensuring values are arrays */
array_init(return_value);
Expand All @@ -993,7 +993,9 @@ PHP_METHOD(Signalforge_Http_Request, getHeaders)
Z_TRY_ADDREF_P(val);
add_next_index_zval(&header_array, val);
}
zend_hash_add(Z_ARRVAL_P(return_value), key, &header_array);
/* Use add_assoc_zval_ex to create fresh key rather than reusing source key.
* This avoids reference counting issues when source HashTable is destroyed. */
add_assoc_zval_ex(return_value, ZSTR_VAL(key), ZSTR_LEN(key), &header_array);
}
} ZEND_HASH_FOREACH_END();
} else {
Expand Down
4 changes: 3 additions & 1 deletion src/response.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,9 @@ PHP_METHOD(Signalforge_Http_Response, getHeaders)
Z_TRY_ADDREF_P(val);
add_next_index_zval(&header_array, val);
}
zend_hash_add(Z_ARRVAL_P(return_value), key, &header_array);
/* Use add_assoc_zval_ex to create fresh key rather than reusing source key.
* This avoids reference counting issues when source HashTable is destroyed. */
add_assoc_zval_ex(return_value, ZSTR_VAL(key), ZSTR_LEN(key), &header_array);
}
} ZEND_HASH_FOREACH_END();
} else {
Expand Down