rasmus                                   Sun, 07 Aug 2011 00:50:46 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=314391

Log:
Since we have fci_cache = &fci_cache_local inside that block
and fci_cache is then later used outside the block, fci_cache_local
can't be block-scoped here

Changed paths:
    U   php/php-src/branches/PHP_5_4/Zend/zend_execute_API.c
    U   php/php-src/trunk/Zend/zend_execute_API.c

Modified: php/php-src/branches/PHP_5_4/Zend/zend_execute_API.c
===================================================================
--- php/php-src/branches/PHP_5_4/Zend/zend_execute_API.c        2011-08-07 
00:36:26 UTC (rev 314390)
+++ php/php-src/branches/PHP_5_4/Zend/zend_execute_API.c        2011-08-07 
00:50:46 UTC (rev 314391)
@@ -763,6 +763,7 @@
        zend_class_entry *called_scope = NULL;
        zval *current_this;
        zend_execute_data execute_data;
+       zend_fcall_info_cache fci_cache_local;

        *fci->retval_ptr_ptr = NULL;

@@ -797,7 +798,6 @@
        }

        if (!fci_cache || !fci_cache->initialized) {
-               zend_fcall_info_cache fci_cache_local;
                char *callable_name;
                char *error = NULL;


Modified: php/php-src/trunk/Zend/zend_execute_API.c
===================================================================
--- php/php-src/trunk/Zend/zend_execute_API.c   2011-08-07 00:36:26 UTC (rev 
314390)
+++ php/php-src/trunk/Zend/zend_execute_API.c   2011-08-07 00:50:46 UTC (rev 
314391)
@@ -763,6 +763,7 @@
        zend_class_entry *called_scope = NULL;
        zval *current_this;
        zend_execute_data execute_data;
+       zend_fcall_info_cache fci_cache_local;

        *fci->retval_ptr_ptr = NULL;

@@ -797,7 +798,6 @@
        }

        if (!fci_cache || !fci_cache->initialized) {
-               zend_fcall_info_cache fci_cache_local;
                char *callable_name;
                char *error = NULL;


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to