]> granicus.if.org Git - php/commitdiff
fix phpdbg, _zend_execute_data.scope was removed with 9a36cb1a07c247766278a888612ecba...
authorFerenc Kovacs <tyrael@php.net>
Fri, 28 Nov 2014 21:12:02 +0000 (22:12 +0100)
committerFerenc Kovacs <tyrael@php.net>
Fri, 28 Nov 2014 21:12:02 +0000 (22:12 +0100)
sapi/phpdbg/phpdbg_frame.c

index f42fc659f17bbb439aedbd9752e888739b9de060..c9ba377d95daadfd18b79ce63f231224909f8c7d 100644 (file)
@@ -37,7 +37,7 @@ void phpdbg_restore_frame(TSRMLS_D) /* {{{ */
        /* move things back */
        EG(current_execute_data) = PHPDBG_FRAME(execute_data);
 
-       EG(scope) = PHPDBG_EX(scope);
+       EG(scope) = PHPDBG_EX(func)->op_array.scope;
 } /* }}} */
 
 void phpdbg_switch_frame(int frame TSRMLS_DC) /* {{{ */
@@ -79,7 +79,7 @@ void phpdbg_switch_frame(int frame TSRMLS_DC) /* {{{ */
                PHPDBG_FRAME(execute_data) = EG(current_execute_data);
                EG(current_execute_data) = execute_data;
 
-               EG(scope) = PHPDBG_EX(scope);
+               EG(scope) = PHPDBG_EX(func)->op_array.scope;
        }
 
        phpdbg_notice("frame", "id=\"%d\"", "Switched to frame #%d", frame);