php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-26 01:18:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Try to fix the leak Rasmus reported. It's pretty sucky code so I'm really

Browse Source 
not sure this fix is OK.I can't remember all of what we did there.
This commit is contained in:
Andi Gutmans
1999-09-18 22:07:12 +00:00
parent a5783da8a9
commit 1ac04fe9f4
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Zend/zend_execute.c
+8 -5
View File
@@ -256,22 +256,25 @@ static inline void zend_assign_to_variable(znode *result, znode *op1, znode *op2
if (T->EA.str->type == IS_STRING
&& (T->EA.offset < T->EA.str->value.str.len)) {
zval tmp;
zval *final_value = value;
if (value->type!=IS_STRING) {
tmp = *value;
zval_copy_ctor(&tmp);
if (op2 && op2->op_type == IS_VAR) {
zval_copy_ctor(&tmp);
}
convert_to_string(&tmp);
value = &tmp;
final_value = &tmp;
}
T->EA.str->value.str.val[T->EA.offset] = value->value.str.val[0];
T->EA.str->value.str.val[T->EA.offset] = final_value->value.str.val[0];
if (op2
&& op2->op_type == IS_VAR
&& value==&Ts[op2->u.var].tmp_var) {
efree(value->value.str.val);
}
if (value == &tmp) {
zval_dtor(value);
if (final_value == &tmp) {
zval_dtor(final_value);
}
/*
* the value of an assignment to a string offset is undefined