]> granicus.if.org Git - php/commitdiff
It is not likely a string
authorXinchen Hui <laruence@php.net>
Tue, 23 Sep 2014 05:50:00 +0000 (13:50 +0800)
committerXinchen Hui <laruence@php.net>
Tue, 23 Sep 2014 05:50:00 +0000 (13:50 +0800)
Zend/zend_operators.c

index 567d18c4aa50bb4db4abb1b90eb606a4dfeb7299..f3e0680f9e50a9248faf9ebffe8234d2d791f4b7 100644 (file)
@@ -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;