com php-src: Fixed memory leak: Zend/tests/generators/generator _closure_unused.phpt Zend/zend_vm_def.h Zend/ze nd_vm_execute.h
| From: | Dmitry Stogov | Date: | Thu, 14 May 2015 14:07:32 +0000 |
| Subject: | com php-src: Fixed memory leak: Zend/tests/generators/generator _closure_unused.phpt Zend/zend_vm_def.h Zend/ze nd_vm_execute.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-86760@lists.php.net to get a copy of this message | ||
Commit: fc75d07652717a374e01aa557b165af3fc9606b6
Author: Dmitry Stogov <dmitry@zend.com> Thu, 14 May 2015 17:07:32 +0300
Parents: 0604df8a82084f2b7d4a46baf28edefa764c1dd2
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=fc75d07652717a374e01aa557b165af3fc9606b6
Log:
Fixed memory leak
Changed paths:
A Zend/tests/generators/generator_closure_unused.phpt
M Zend/zend_vm_def.h
M Zend/zend_vm_execute.h
Diff:
diff --git a/Zend/tests/generators/generator_closure_unused.phpt
b/Zend/tests/generators/generator_closure_unused.phpt
new file mode 100644
index 0000000..9acf8f9
--- /dev/null
+++ b/Zend/tests/generators/generator_closure_unused.phpt
@@ -0,0 +1,9 @@
+--TEST--
+Closures can be unused generators
+--FILE--
+<?php
+(function(){yield;})();
+echo "ok\n";
+?>
+--EXPECT--
+ok
\ No newline at end of file
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index facc1f8..c1f8558 100644
--- a/Zend/zend_vm_def..h
+++ b/Zend/zend_vm_def.h
@@ -3563,7 +3563,7 @@ ZEND_VM_HANDLER(131, ZEND_DO_FCALL_BY_NAME, ANY, ANY)
if (EXPECTED(fbc->type == ZEND_USER_FUNCTION)) {
EG(scope) = NULL;
if (UNEXPECTED((fbc->common.fn_flags & ZEND_ACC_GENERATOR) != 0)) {
- if (RETURN_VALUE_USED(opline)) {
+ if (EXPECTED(RETURN_VALUE_USED(opline))) {
ret = EX_VAR(opline->result.var);
zend_generator_create_zval(call, &fbc->op_array, ret);
Z_VAR_FLAGS_P(ret) = 0;
@@ -3685,11 +3685,14 @@ ZEND_VM_HANDLER(60, ZEND_DO_FCALL, ANY, ANY)
if (EXPECTED(fbc->type == ZEND_USER_FUNCTION)) {
EG(scope) = fbc->common.scope;
if (UNEXPECTED((fbc->common.fn_flags & ZEND_ACC_GENERATOR) != 0)) {
- if (RETURN_VALUE_USED(opline)) {
+ if (EXPECTED(RETURN_VALUE_USED(opline))) {
ret = EX_VAR(opline->result.var);
zend_generator_create_zval(call, &fbc->op_array, ret);
Z_VAR_FLAGS_P(ret) = 0;
} else {
+ if (UNEXPECTED(ZEND_CALL_INFO(call) & ZEND_CALL_CLOSURE)) {
+ OBJ_RELEASE((zend_object*)fbc->op_array.prototype);
+ }
zend_vm_stack_free_args(call);
}
} else {
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index d4902ef..6b7f91b 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -627,7 +627,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DO_FCALL_BY_NAME_SPEC_HANDLER(
if (EXPECTED(fbc->type == ZEND_USER_FUNCTION)) {
EG(scope) = NULL;
if (UNEXPECTED((fbc->common.fn_flags & ZEND_ACC_GENERATOR) != 0)) {
- if (RETURN_VALUE_USED(opline)) {
+ if (EXPECTED(RETURN_VALUE_USED(opline))) {
ret = EX_VAR(opline->result.var);
zend_generator_create_zval(call, &fbc->op_array, ret);
Z_VAR_FLAGS_P(ret) = 0;
@@ -749,11 +749,14 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL
ZEND_DO_FCALL_SPEC_HANDLER(ZEND_OPC
if (EXPECTED(fbc->type == ZEND_USER_FUNCTION)) {
EG(scope) = fbc->common.scope;
if (UNEXPECTED((fbc->common.fn_flags & ZEND_ACC_GENERATOR) != 0)) {
- if (RETURN_VALUE_USED(opline)) {
+ if (EXPECTED(RETURN_VALUE_USED(opline))) {
ret = EX_VAR(opline->result.var);
zend_generator_create_zval(call, &fbc->op_array, ret);
Z_VAR_FLAGS_P(ret) = 0;
} else {
+ if (UNEXPECTED(ZEND_CALL_INFO(call) & ZEND_CALL_CLOSURE)) {
+ OBJ_RELEASE((zend_object*)fbc->op_array.prototype);
+ }
zend_vm_stack_free_args(call);
}
} else {