From: Dmitry Stogov <dmitry@php.net>
Date: Wed, 17 Dec 2003 14:45:59 +0000 (+0000)
Subject: Dynamic function call from object's property was fixed
X-Git-Tag: php-5.0.0b3RC1~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3c4cfd3ec82f5c5dc30f3008fc3466e52726adce;p=php

Dynamic function call from object's property was fixed
(See "tests/lang/bug24926.phpt" and "tests/lang/bug25652.phpt")
---

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 7e7077a872..a6f8ecd909 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -1194,9 +1194,16 @@ void zend_do_begin_method_call(znode *left_bracket TSRMLS_DC)
 		return;
 	}
 
-	last_op->opcode = ZEND_INIT_METHOD_CALL;
-
-	left_bracket->u.constant.value.lval = ZEND_INIT_FCALL_BY_NAME;
+	if (last_op->opcode == ZEND_FETCH_OBJ_R) {
+		last_op->opcode = ZEND_INIT_METHOD_CALL;
+		left_bracket->u.constant.value.lval = ZEND_INIT_FCALL_BY_NAME;
+	} else {
+		zend_op* opline = get_next_op(CG(active_op_array) TSRMLS_CC);
+		opline->opcode = ZEND_INIT_FCALL_BY_NAME;
+		opline->op2 = *left_bracket;
+		opline->extended_value = 0;
+		SET_UNUSED(opline->op1);
+	}
 
 	zend_stack_push(&CG(function_call_stack), (void *) &ptr, sizeof(zend_function *));
 	zend_do_extended_fcall_begin(TSRMLS_C);