com php-src: Preserve return value in zend_vm_call_opcode _handler with global opline/ex registers enabled: Zend/zend_vm_execute.h
Zend/zend_vm_gen.php
| From: | Bob Weinand | Date: | Mon, 13 Jul 2015 12:12:45 +0000 |
| Subject: | com php-src: Preserve return value in zend_vm_call_opcode _handler with global opline/ex registers enabled: Zend/zend_vm_execute.h Zend/zend_vm_gen.php |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-87954@lists.php.net to get a copy of this message | ||
Commit: 82b1e22b5763350d22a1fcd638a648015ca85ca4
Author: Bob Weinand <bobwei9@hotmail.com> Mon, 13 Jul 2015 13:45:27 +0200
Parents: 420b745a05dfd9a258c9892fc5cfaaacef73bc30
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=82b1e22b5763350d22a1fcd638a648015ca85ca4
Log:
Preserve return value in zend_vm_call_opcode_handler with global opline/ex registers enabled
Changed paths:
M Zend/zend_vm_execute.h
M Zend/zend_vm_gen.php
Diff:
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index d2ea5a6..8419dcc 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -49553,7 +49553,10 @@ ZEND_API int zend_vm_call_opcode_handler(zend_execute_data* ex)
LOAD_OPLINE();
#if defined(ZEND_VM_FP_GLOBAL_REG) && defined(ZEND_VM_IP_GLOBAL_REG)
((opcode_handler_t)OPLINE->handler)(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
- ret = (opline) ? 0 : -1;
+ ret = (opline) ? execute_data != ex : -1;
+ if (ret == 1 && execute_data->prev_execute_data != ex) {
+ ret = 2;;
+ }
#else
ret = ((opcode_handler_t)OPLINE->handler)(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
#endif
diff --git a/Zend/zend_vm_gen.php b/Zend/zend_vm_gen.php
index 36c4a32..ce4a321 100644
--- a/Zend/zend_vm_gen.php
+++ b/Zend/zend_vm_gen.php
@@ -1606,7 +1606,10 @@ function gen_vm($def, $skel) {
out($f, "\tLOAD_OPLINE();\n");
out($f,"#if defined(ZEND_VM_FP_GLOBAL_REG) &&
defined(ZEND_VM_IP_GLOBAL_REG)\n");
out($f,
"\t((opcode_handler_t)OPLINE->handler)(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);\n");
- out($f, "\tret = (opline) ? 0 : -1;\n");
+ out($f, "\tret = (opline) ? execute_data != ex : -1;\n");
+ out($f, "\tif (ret == 1 && execute_data->prev_execute_data != ex) {\n");
+ out($f, "\t\tret = 2;;\n");
+ out($f, "\t}\n");
out($f, "#else\n");
out($f, "\tret =
((opcode_handler_t)OPLINE->handler)(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);\n");
out($f, "#endif\n");