com php-src: It is not likely a string: Zend/zend_operators .c
| From: | Xinchen Hui | Date: | Tue, 23 Sep 2014 05:50:00 +0000 |
| Subject: | com php-src: It is not likely a string: Zend/zend_operators .c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81873@lists.php.net to get a copy of this message | ||
Commit: e029042c36eab032a9e15e5af6699bb0163e0a4f
Author: Xinchen Hui <laruence@php.net> Tue, 23 Sep 2014 13:50:00 +0800
Parents: 22fbfdfb8ea8b192f523e8e9c9f4ac71f2a7e87b
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e029042c36eab032a9e15e5af6699bb0163e0a4f
Log:
It is not likely a string
Changed paths:
M Zend/zend_operators.c
Diff:
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
index 567d18c..f3e0680 100644
--- a/Zend/zend_operators.c
+++ b/Zend/zend_operators.c
@@ -827,8 +827,6 @@ try_again:
case IS_NULL:
case IS_FALSE:
return STR_EMPTY_ALLOC();
- case IS_STRING:
- return zend_string_copy(Z_STR_P(op));
case IS_TRUE:
return zend_string_init("1", 1, 0);
case IS_RESOURCE: {
@@ -868,6 +866,8 @@ try_again:
case IS_REFERENCE:
op = Z_REFVAL_P(op);
goto try_again;
+ case IS_STRING:
+ return zend_string_copy(Z_STR_P(op));
EMPTY_SWITCH_DEFAULT_CASE()
}
return NULL;