]> granicus.if.org Git - php/commitdiff
Fixed bug #43027 (Declare cause fatal error)
authorDmitry Stogov <dmitry@php.net>
Thu, 1 Nov 2007 11:58:58 +0000 (11:58 +0000)
committerDmitry Stogov <dmitry@php.net>
Thu, 1 Nov 2007 11:58:58 +0000 (11:58 +0000)
Zend/tests/bug43027.phpt [new file with mode: 0755]
Zend/zend_compile.c

diff --git a/Zend/tests/bug43027.phpt b/Zend/tests/bug43027.phpt
new file mode 100755 (executable)
index 0000000..2cf2d1d
--- /dev/null
@@ -0,0 +1,10 @@
+--TEST--
+Bug #43027 (Declare cause fatal error)
+--FILE--
+<?php
+declare(ticks=1);
+namespace test;
+echo "ok\n";
+?>
+--EXPECT--
+ok
index 291fce27b4e647b53b0947c21015722618175bca..2b97eb0de0c991d2c3276166fdc4d3a5cb462061 100644 (file)
@@ -4568,10 +4568,11 @@ void zend_do_namespace(znode *name TSRMLS_DC) /* {{{ */
        char *lcname;
 
        if (CG(active_op_array)->last > 0) {
-               /* ignore ZEND_EXT_STMT */
+               /* ignore ZEND_EXT_STMT and ZEND_TICKS */
                int num = CG(active_op_array)->last;
                while (num > 0 &&
-                      CG(active_op_array)->opcodes[num-1].opcode == ZEND_EXT_STMT) {
+                      (CG(active_op_array)->opcodes[num-1].opcode == ZEND_EXT_STMT ||
+                       CG(active_op_array)->opcodes[num-1].opcode == ZEND_TICKS)) {
                        --num;
                }
                if (num > 0) {