Skip to content

Zend: Fix string leak in zend_update_property_string{,l} on write failure #22039

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
iliaal wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −6
Open

Zend: Fix string leak in zend_update_property_string{,l} on write failure #22039

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: 8 additions & 6 deletions Zend/zend_API.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4984,8 +4984,8 @@ ZEND_API void zend_update_property_string(const zend_class_entry *scope, zend_ob
zval tmp;

ZVAL_STRING(&tmp, value);
Z_SET_REFCOUNT(tmp, 0);
zend_update_property(scope, object, name, name_length, &tmp);
zval_ptr_dtor(&tmp);
}
/* }}} */

Expand All @@ -4994,8 +4994,8 @@ ZEND_API void zend_update_property_stringl(const zend_class_entry *scope, zend_o
zval tmp;

ZVAL_STRINGL(&tmp, value, value_len);
Z_SET_REFCOUNT(tmp, 0);
zend_update_property(scope, object, name, name_length, &tmp);
zval_ptr_dtor(&tmp);
}
/* }}} */

Expand Down Expand Up @@ -5085,8 +5085,9 @@ ZEND_API zend_result zend_update_static_property_string(zend_class_entry *scope,
zval tmp;

ZVAL_STRING(&tmp, value);
Z_SET_REFCOUNT(tmp, 0);
return zend_update_static_property(scope, name, name_length, &tmp);
zend_result retval = zend_update_static_property(scope, name, name_length, &tmp);
zval_ptr_dtor(&tmp);
return retval;
}
/* }}} */

Expand All @@ -5095,8 +5096,9 @@ ZEND_API zend_result zend_update_static_property_stringl(zend_class_entry *scope
zval tmp;

ZVAL_STRINGL(&tmp, value, value_len);
Z_SET_REFCOUNT(tmp, 0);
return zend_update_static_property(scope, name, name_length, &tmp);
zend_result retval = zend_update_static_property(scope, name, name_length, &tmp);
zval_ptr_dtor(&tmp);
return retval;
}
/* }}} */

Expand Down
Loading