[xdebug-dev] xdebug xdebug/xdebug.c - Fixed display of unused returned variables from functions in PHP 5.3.

Date: Fri Dec 26 13:02:12 CET 2008
User: Derick Rethans
Directory: xdebug

Log Message:
[0.50]
- Fixed display of unused returned variables from functions in PHP 5.3.
#- This is the "famous" return_value_ptr_ptr fix.

Modified files:
           xdebug/xdebug.c (version: 1.439)

[FILE: /xdebug/xdebug.c]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.438
retrieving revision 1.439
diff -u -r1.438 -r1.439
--- xdebug/xdebug.c:1.438 Thu Dec 25 21:58:48 2008 GMT
+++ xdebug/xdebug.c Fri Dec 26 11:02:12 2008 GMT
@@ -1426,6 +1426,7 @@
         int function_nr = 0;
         xdebug_llist_element *le;
         int eval_id = 0;
+ zval *return_val = NULL;
 
 
         if (XG(no_exec) == 1) {
@@ -1605,6 +1606,11 @@
         if (XG(profiler_enabled)) {
                 xdebug_profiler_function_user_begin(fse TSRMLS_CC);
         }
+
+ if (EG(return_value_ptr_ptr) == NULL) {
+ EG(return_value_ptr_ptr) = &return_val;
+ }
+
         xdebug_old_execute(op_array TSRMLS_CC);
 
         if (XG(profiler_enabled)) {
@@ -1623,6 +1629,11 @@
                 }
         }
 
+ if (return_val) {
+ zval_ptr_dtor(&return_val);
+ EG(return_value_ptr_ptr) = NULL;
+ }
+
         /* Check for return breakpoints */
         if (XG(remote_enabled) && XG(breakpoints_allowed)) {
                 if (!handle_breakpoints(fse, XDEBUG_BRK_FUNC_RETURN)) {
Received on Fri Dec 26 2008 - 13:02:15 GMT