Created
September 3, 2014 12:05
-
-
Save dstogov/bbfe39c387580d42d458 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c | |
index a8ee529..0b42f95 100644 | |
--- a/Zend/zend_compile.c | |
+++ b/Zend/zend_compile.c | |
@@ -3604,9 +3604,13 @@ static void zend_compile_simple_var(znode *result, zend_ast *ast, uint32_t type | |
static void zend_separate_if_call_and_write(znode *node, zend_ast *ast, uint32_t type TSRMLS_DC) /* {{{ */ | |
{ | |
if (type != BP_VAR_R && type != BP_VAR_IS && zend_is_call(ast)) { | |
- zend_op *opline = zend_emit_op(NULL, ZEND_SEPARATE, node, NULL TSRMLS_CC); | |
- opline->result_type = IS_VAR; | |
- opline->result.var = opline->op1.var; | |
+ if (node->op_type == IS_VAR) { | |
+ zend_op *opline = zend_emit_op(NULL, ZEND_SEPARATE, node, NULL TSRMLS_CC); | |
+ opline->result_type = IS_VAR; | |
+ opline->result.var = opline->op1.var; | |
+ } else { | |
+ zend_error_noreturn(E_COMPILE_ERROR, "Cannot use result of built-in function in write context"); | |
+ } | |
} | |
} | |
/* }}} */ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment