com php-src: Fixed destruction on error: Zend/zend_ini.c
| From: | Dmitry Stogov | Date: | Tue, 02 Sep 2014 05:46:27 +0000 |
| Subject: | com php-src: Fixed destruction on error: Zend/zend_ini.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81360@lists.php.net to get a copy of this message | ||
Commit: f789568707e23a334c5edc944511976f269b1f74
Author: Dmitry Stogov <dmitry@zend.com> Tue, 2 Sep 2014 09:46:27 +0400
Parents: aa759743b37f0979e42f7f8327e863bee1b29f98
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f789568707e23a334c5edc944511976f269b1f74
Log:
Fixed destruction on error
Changed paths:
M Zend/zend_ini.c
Diff:
diff --git a/Zend/zend_ini.c b/Zend/zend_ini.c
index 3708efa..897255d 100644
--- a/Zend/zend_ini.c
+++ b/Zend/zend_ini.c
@@ -215,8 +215,11 @@ ZEND_API int zend_register_ini_entries(const zend_ini_entry_def *ini_entry, int
config_directive_success = 0;
if (zend_hash_add_ptr(directives, p->name, (void*)p) == NULL) {
- if (p->orig_value) {
- zend_string_release(p->orig_value);
+ if (p->name) {
+ zend_string_release(p->name);
+ }
+ if (p->value) {
+ zend_string_release(p->value);
}
zend_unregister_ini_entries(module_number TSRMLS_CC);
return FAILURE;