From: Dmitry Stogov <dmitry@php.net>
Date: Wed, 8 Jun 2005 15:48:12 +0000 (+0000)
Subject: Fixed incorrect usage of zend_mangle_property_name() (valgrind errors)
X-Git-Tag: php-5.0.1b1~41
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=415ec46927b71120f351a404caf4da64e2668ed4;p=php

Fixed incorrect usage of zend_mangle_property_name() (valgrind errors)
---

diff --git a/ext/standard/var.c b/ext/standard/var.c
index fd92046ae6..e4f68f37e2 100644
--- a/ext/standard/var.c
+++ b/ext/standard/var.c
@@ -584,18 +584,18 @@ static void php_var_serialize_class(smart_str *buf, zval **struc, zval *retval_p
 					
 					do {
 						zend_mangle_property_name(&priv_name, &prop_name_length, ce->name, ce->name_length, 
-									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);
+									Z_STRVAL_PP(name), Z_STRLEN_PP(name), ce->type & ZEND_INTERNAL_CLASS);
+						if (zend_hash_find(Z_OBJPROP_PP(struc), priv_name, prop_name_length+1, (void *) &d) == SUCCESS) {
+							php_var_serialize_string(buf, priv_name, prop_name_length);
 							efree(priv_name);
 							php_var_serialize_intern(buf, d, var_hash TSRMLS_CC);
 							break;
 						}
 						efree(priv_name);
 						zend_mangle_property_name(&prot_name, &prop_name_length,  "*", 1, 
-									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);
+									Z_STRVAL_PP(name), Z_STRLEN_PP(name), ce->type & ZEND_INTERNAL_CLASS);
+						if (zend_hash_find(Z_OBJPROP_PP(struc), prot_name, prop_name_length+1, (void *) &d) == SUCCESS) {
+							php_var_serialize_string(buf, prot_name, prop_name_length);
 							efree(prot_name);
 							php_var_serialize_intern(buf, d, var_hash TSRMLS_CC);
 							break;