Skip to content

ext/standard: remove unnecessary var_hash check #24744

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
ndossche merged 2 commits into from
Oct 26, 2026
+3 −1
Merged

ext/standard: remove unnecessary var_hash check #24744

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e15c76
ext/standard: remove unnecessary var_hash check
Sjord Oct 26, 2026
fed210f
Supress compiler warning
Sjord Oct 26, 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
4 changes: 3 additions & 1 deletion ext/standard/var.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1124,6 +1124,8 @@ static void php_var_serialize_intern(smart_str *buf, zval *struc, php_serialize_
zend_long var_already;
HashTable *myht;

ZEND_ASSERT(var_hash != NULL);

if (EG(exception)) {
return;
}
Expand All @@ -1132,7 +1134,7 @@ static void php_var_serialize_intern(smart_str *buf, zval *struc, php_serialize_
return;
}

if (var_hash && (var_already = php_add_var_hash(var_hash, struc, in_rcn_array))) {
if ((var_already = php_add_var_hash(var_hash, struc, in_rcn_array))) {
if (var_already == -1) {
/* Reference to an object that failed to serialize, replace with null. */
smart_str_appendl(buf, "N;", 2);
Expand Down
Loading