From: Bob Weinand <bobwei9@hotmail.com>
Date: Mon, 16 Jun 2014 09:10:50 +0000 (+0200)
Subject: Fix patch for bug #67436
X-Git-Tag: php-5.5.15RC1~54^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0a3979e08b05a539090975c8bbda520438a1789e;p=php

Fix patch for bug #67436
---

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 519227cd7a..6ea3b18003 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -3150,7 +3150,7 @@ static char * zend_get_function_declaration(zend_function *fptr TSRMLS_DC) /* {{
 						*zv = *precv->op2.zv;
 						zval_copy_ctor(zv);
 						INIT_PZVAL(zv);
-						if (Z_TYPE_P(zv) == IS_CONSTANT) {
+						if ((Z_TYPE_P(zv) & IS_CONSTANT_TYPE_MASK) == IS_CONSTANT) {
 							REALLOC_BUF_IF_EXCEED(buf, offset, length, Z_STRLEN_P(zv));
 							memcpy(offset, Z_STRVAL_P(zv), Z_STRLEN_P(zv));
 							offset += Z_STRLEN_P(zv);
@@ -3176,7 +3176,7 @@ static char * zend_get_function_declaration(zend_function *fptr TSRMLS_DC) /* {{
 								*(offset++) = '.';
 							}
 							*(offset++) = '\'';
-						} else if (Z_TYPE_P(zv) == IS_ARRAY || Z_TYPE_P(zv) == IS_CONSTANT_ARRAY) {
+						} else if (Z_TYPE_P(zv) == IS_ARRAY || (Z_TYPE_P(zv) & IS_CONSTANT_TYPE_MASK) == IS_CONSTANT_ARRAY) {
 							memcpy(offset, "Array", 5);
 							offset += 5;
 						} else {