com php-src: Fix patch for bug #67436: Zend/zend_compile.c
| From: | Bob Weinand | Date: | Mon, 16 Jun 2014 09:10:50 +0000 |
| Subject: | com php-src: Fix patch for bug #67436: Zend/zend_compile.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-78909@lists.php.net to get a copy of this message | ||
Commit: 0a3979e08b05a539090975c8bbda520438a1789e
Author: Bob Weinand <bobwei9@hotmail.com> Mon, 16 Jun 2014 11:10:50 +0200
Parents: 4053dbe29f905463830bc88040ff12bf7fa74264
Branches: PHP-5.4
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0a3979e08b05a539090975c8bbda520438a1789e
Log:
Fix patch for bug #67436
Bugs:
https://bugs.php.net/67436
Changed paths:
M Zend/zend_compile.c
Diff:
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 519227c..6ea3b18 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 {