Skip to content

The zval_dtor() alias of zval_ptr_dtor_nogc() has been removed in php 8.6 (master) #408

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

Open
k0d3r1s wants to merge 1 commit into
base: master
Choose a base branch
from
Open

The zval_dtor() alias of zval_ptr_dtor_nogc() has been removed in php 8.6 (master) #408

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
14 changes: 7 additions & 7 deletions src/php7/igbinary.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2601,7 +2601,7 @@ zend_always_inline static int igbinary_unserialize_array(struct igbinary_unseria
if (IGB_NEEDS_MORE_DATA(igsd, 1)) {
zend_error(E_WARNING, "igbinary_unserialize_array: end-of-data");
cleanup:
zval_dtor(z);
zval_ptr_dtor_nogc(z);
ZVAL_NULL(z);
return 1;
}
Expand Down Expand Up @@ -2759,7 +2759,7 @@ inline static int igbinary_unserialize_object_properties(struct igbinary_unseria

if (IGB_NEEDS_MORE_DATA(igsd, 1)) {
zend_error(E_WARNING, "igbinary_unserialize_object_properties: end-of-data");
zval_dtor(z);
zval_ptr_dtor_nogc(z);
ZVAL_NULL(z);
return 1;
}
Expand All @@ -2778,13 +2778,13 @@ inline static int igbinary_unserialize_object_properties(struct igbinary_unseria
{
zend_long key_index = 0;
if (UNEXPECTED(igbinary_unserialize_long(igsd, key_type, &key_index))) {
zval_dtor(z);
zval_ptr_dtor_nogc(z);
ZVAL_UNDEF(z);
return 1;
}
key_str = zend_long_to_str(key_index);
if (UNEXPECTED(key_str == NULL)) {
zval_dtor(z);
zval_ptr_dtor_nogc(z);
ZVAL_UNDEF(z);
return 1;
}
Expand All @@ -2795,7 +2795,7 @@ inline static int igbinary_unserialize_object_properties(struct igbinary_unseria
case igbinary_type_string_id32:
key_str = igbinary_unserialize_string(igsd, key_type);
if (UNEXPECTED(key_str == NULL)) {
zval_dtor(z);
zval_ptr_dtor_nogc(z);
ZVAL_UNDEF(z);
return 1;
}
Expand All @@ -2806,7 +2806,7 @@ inline static int igbinary_unserialize_object_properties(struct igbinary_unseria
case igbinary_type_string64:
key_str = igbinary_unserialize_chararray(igsd, key_type, 1);
if (UNEXPECTED(key_str == NULL)) {
zval_dtor(z);
zval_ptr_dtor_nogc(z);
ZVAL_UNDEF(z);
return 1;
}
Expand All @@ -2818,7 +2818,7 @@ inline static int igbinary_unserialize_object_properties(struct igbinary_unseria
continue; /* Skip unserializing this element, serialized with no value. In C, this applies to loop, not switch. */
default:
zend_error(E_WARNING, "igbinary_unserialize_object_properties: unknown key type '%02x', position %zu", key_type, (size_t)IGB_BUFFER_OFFSET(igsd));
zval_dtor(z);
zval_ptr_dtor_nogc(z);
ZVAL_UNDEF(z);
return 1;
}
Expand Down
Loading