]> granicus.if.org Git - php/commitdiff
fix C89 compat
authorAnatol Belski <ab@php.net>
Thu, 25 Sep 2014 18:28:34 +0000 (20:28 +0200)
committerAnatol Belski <ab@php.net>
Thu, 25 Sep 2014 18:28:34 +0000 (20:28 +0200)
Zend/zend_operators.c

index e14911d0605496d7c9b3a78c002d9a95b9c4b516..b0a0e7519ed60b010948595d6ef86ebc95940cdf 100644 (file)
@@ -2162,9 +2162,11 @@ try_again:
                        if (Z_OBJ_HANDLER_P(op1, get)
                           && Z_OBJ_HANDLER_P(op1, set)) {
                                /* proxy object */
-                               TSRMLS_FETCH();
                                zval rv;
-                               zval *val = Z_OBJ_HANDLER_P(op1, get)(op1, &rv TSRMLS_CC);
+                               zval *val;
+                               TSRMLS_FETCH();
+
+                               val = Z_OBJ_HANDLER_P(op1, get)(op1, &rv TSRMLS_CC);
                                Z_ADDREF_P(val);
                                fast_increment_function(val);
                                Z_OBJ_HANDLER_P(op1, set)(op1, val TSRMLS_CC);
@@ -2235,9 +2237,11 @@ try_again:
                        if (Z_OBJ_HANDLER_P(op1, get)
                           && Z_OBJ_HANDLER_P(op1, set)) {
                                /* proxy object */
-                               TSRMLS_FETCH();
                                zval rv;
-                               zval *val = Z_OBJ_HANDLER_P(op1, get)(op1, &rv TSRMLS_CC);
+                               zval *val;
+                               TSRMLS_FETCH();
+
+                               val = Z_OBJ_HANDLER_P(op1, get)(op1, &rv TSRMLS_CC);
                                Z_ADDREF_P(val);
                                fast_decrement_function(val);
                                Z_OBJ_HANDLER_P(op1, set)(op1, val TSRMLS_CC);