]> granicus.if.org Git - php/commitdiff
Fixed memory leak (forgot to release the zval)
authorXinchen Hui <laruence@gmail.com>
Wed, 19 Feb 2014 10:41:50 +0000 (18:41 +0800)
committerXinchen Hui <laruence@gmail.com>
Wed, 19 Feb 2014 10:41:50 +0000 (18:41 +0800)
Zend/zend_vm_def.h
Zend/zend_vm_execute.h

index 0a9d86490d819be25f3ca367b3f2b997a8a9ee47..595512b4fd3370f39ecdae39894c0bd17b9262fa 100644 (file)
@@ -4678,9 +4678,8 @@ ZEND_VM_HANDLER(58, ZEND_END_SILENCE, TMP, ANY)
                        }
                        EG(error_reporting_ini_entry)->value = estrndup(Z_STRVAL(restored_error_reporting), Z_STRLEN(restored_error_reporting));
                        EG(error_reporting_ini_entry)->value_length = Z_STRLEN(restored_error_reporting);
-               } else {
-                       zval_dtor(&restored_error_reporting);
-               }
+               } 
+               zval_dtor(&restored_error_reporting);
        }
 //???  if (EX(old_error_reporting) == EX_VAR(opline->op1.var)) {
 //???          EX(old_error_reporting) = NULL;
index 7505189e51ac5bf6950bbda78591a150842af53c..881fef40ac5723efde30108bc83ac9a4b50fb17e 100644 (file)
@@ -8102,9 +8102,8 @@ static int ZEND_FASTCALL  ZEND_END_SILENCE_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_
                        }
                        EG(error_reporting_ini_entry)->value = estrndup(Z_STRVAL(restored_error_reporting), Z_STRLEN(restored_error_reporting));
                        EG(error_reporting_ini_entry)->value_length = Z_STRLEN(restored_error_reporting);
-               } else {
-                       zval_dtor(&restored_error_reporting);
                }
+               zval_dtor(&restored_error_reporting);
        }
 //???  if (EX(old_error_reporting) == EX_VAR(opline->op1.var)) {
 //???          EX(old_error_reporting) = NULL;