diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-09-03 02:07:38 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-09-03 02:07:38 +0400 |
| commit | 0940e54ffc73fc470772228f219750727375c384 (patch) | |
| tree | a7de679efd5e82a7e73d531681317bdf5b2419f0 /Zend/zend_vm_execute.h | |
| parent | 6036d47e6a7d23d70483a3bf71e5ee7914e0e957 (diff) | |
| download | php-git-0940e54ffc73fc470772228f219750727375c384.tar.gz | |
Fixed memory leaks
Diffstat (limited to 'Zend/zend_vm_execute.h')
| -rw-r--r-- | Zend/zend_vm_execute.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 2118904616..14a587133e 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -1121,9 +1121,6 @@ static int ZEND_FASTCALL ZEND_BEGIN_SILENCE_SPEC_HANDLER(ZEND_OPCODE_HANDLER_AR } } ZVAL_NEW_STR(EX_VAR(opline->result.var), EG(error_reporting_ini_entry)->value); - if (EG(error_reporting_ini_entry)->value) { - zend_string_addref(EG(error_reporting_ini_entry)->value); - } if (Z_TYPE(EX(old_error_reporting)) == IS_UNDEF) { ZVAL_NEW_STR(&EX(old_error_reporting), EG(error_reporting_ini_entry)->value); } @@ -1139,8 +1136,6 @@ static int ZEND_FASTCALL ZEND_BEGIN_SILENCE_SPEC_HANDLER(ZEND_OPCODE_HANDLER_AR EG(error_reporting_ini_entry)->orig_modifiable = EG(error_reporting_ini_entry)->modifiable; EG(error_reporting_ini_entry)->modified = 1; } - } else if (EG(error_reporting_ini_entry)->value != EG(error_reporting_ini_entry)->orig_value) { - zend_string_release(EG(error_reporting_ini_entry)->value); } if (CG(one_char_string)['0']) { EG(error_reporting_ini_entry)->value = CG(one_char_string)['0']; @@ -10043,7 +10038,8 @@ static int ZEND_FASTCALL ZEND_END_SILENCE_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ EG(error_reporting) = EX_VAR(opline->op1.var)->u2.error_reporting; if (EXPECTED(Z_TYPE_P(EX_VAR(opline->op1.var)) == IS_STRING)) { if (EXPECTED(EG(error_reporting_ini_entry)->modified && - EG(error_reporting_ini_entry)->value != EG(error_reporting_ini_entry)->orig_value)) { + EG(error_reporting_ini_entry)->value != EG(error_reporting_ini_entry)->orig_value) && + EG(error_reporting_ini_entry)->value != Z_STR_P(EX_VAR(opline->op1.var))) { zend_string_release(EG(error_reporting_ini_entry)->value); } EG(error_reporting_ini_entry)->value = Z_STR_P(EX_VAR(opline->op1.var)); |