com php-src: Fix (system) ini entry transfer: phpdbg_wait.c

From: Date: Sat, 04 Oct 2014 22:16:19 +0000
Subject: com php-src: Fix (system) ini entry transfer: phpdbg_wait.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-82601@lists.php.net to get a copy of this message
Commit: f48fc67c86cebb4526cfa14c84530dd31ab2ff3f Author: Bob Weinand <bobwei9@hotmail.com> Sun, 5 Oct 2014 00:16:19 +0200 Parents: 19cdad194bbb19e96ff049260f6a4b663ed8c595 Branches: PHP-5.6 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f48fc67c86cebb4526cfa14c84530dd31ab2ff3f Log: Fix (system) ini entry transfer Changed paths: M phpdbg_wait.c Diff: diff --git a/phpdbg_wait.c b/phpdbg_wait.c index 286be36..4b06700 100644 --- a/phpdbg_wait.c +++ b/phpdbg_wait.c @@ -312,9 +312,12 @@ void phpdbg_webdata_decompress(char *msg, int len TSRMLS_DC) { if (Z_TYPE_PP(ini_entry) == IS_STRING) { if (zend_hash_find(EG(ini_directives), Z_STRVAL(key), Z_STRLEN(key) + 1, (void **) &original_ini) == SUCCESS) { if (!original_ini->on_modify || original_ini->on_modify(original_ini, Z_STRVAL_PP(ini_entry), Z_STRLEN_PP(ini_entry), original_ini->mh_arg1, original_ini->mh_arg2, original_ini->mh_arg3, ZEND_INI_STAGE_ACTIVATE TSRMLS_CC) == SUCCESS) { + if (original_ini->modified && original_ini->orig_value != original_ini->value) { + efree(original_ini->value); + } original_ini->value = Z_STRVAL_PP(ini_entry); original_ini->value_length = Z_STRLEN_PP(ini_entry); - continue; /* don't free the string */ + Z_TYPE_PP(ini_entry) = IS_NULL; /* don't free the value */ } } }

« previous php.cvs (#82601) next »