cvs: php-src /ext/standard var.c

iliaa Sun Aug 29 13:16:21 2004 EDT Modified files: /php-src/ext/standard var.c Log: Fixed leak when serializing protected & private properties. http://cvs.php.net/diff.php/php-src/ext/standard/var.c?r1=1.192&r2=1.193&ty=u Index: php-src/ext/standard/var.c diff -u php-src/ext/standard/var.c:1.192 php-src/ext/standard/var.c:1.193 --- php-src/ext/standard/var.c:1.192 Sat Aug 21 09:49:19 2004 +++ php-src/ext/standard/var.c Sun Aug 29 13:16:20 2004 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: var.c,v 1.192 2004/08/21 13:49:19 andrey Exp $ */ +/* $Id: var.c,v 1.193 2004/08/29 17:16:20 iliaa Exp $ */ /* {{{ includes @@ -594,6 +594,7 @@ Z_STRVAL_PP(name), Z_STRLEN_PP(name) + 1, ce->type & ZEND_INTERNAL_CLASS); if (zend_hash_find(Z_OBJPROP_PP(struc), priv_name, prop_name_length, (void *) &d) == SUCCESS) { php_var_serialize_string(buf, priv_name, prop_name_length-1); + efree(priv_name); php_var_serialize_intern(buf, d, var_hash TSRMLS_CC); break; } @@ -601,12 +602,16 @@ Z_STRVAL_PP(name), Z_STRLEN_PP(name) + 1, ce->type & ZEND_INTERNAL_CLASS); if (zend_hash_find(Z_OBJPROP_PP(struc), prot_name, prop_name_length, (void *) &d) == SUCCESS) { php_var_serialize_string(buf, prot_name, prop_name_length - 1); + efree(prot_name); php_var_serialize_intern(buf, d, var_hash TSRMLS_CC); break; } php_error_docref(NULL TSRMLS_CC, E_NOTICE, "\"%s\" returned as member variable from __sleep() but does not exist", Z_STRVAL_PP(name)); php_var_serialize_string(buf, Z_STRVAL_PP(name), Z_STRLEN_PP(name)); php_var_serialize_intern(buf, &nvalp, var_hash TSRMLS_CC); + + efree(prot_name); + efree(priv_name); } while (0); } else { php_var_serialize_string(buf, Z_STRVAL_PP(name), Z_STRLEN_PP(name));