[xdebug-dev] xdebug xdebug/xdebug.c - Fixed bug #355: Function numbers in trace files weren't unique.

Date: Sun Nov 22 19:43:28 CET 2009
User: Derick Rethans
Directory: xdebug

Log Message:
[0.25]
- Fixed bug #355: Function numbers in trace files weren't unique.

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

[FILE: /xdebug/xdebug.c]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.461
retrieving revision 1.462
diff -u -r1.461 -r1.462
--- xdebug/xdebug.c:1.461 Sun Nov 22 15:56:05 2009 GMT
+++ xdebug/xdebug.c Sun Nov 22 17:43:28 2009 GMT
@@ -927,7 +927,7 @@
         XG(profile_file) = NULL;
         XG(profile_filename) = NULL;
         XG(prev_memory) = 0;
- XG(function_count) = 0;
+ XG(function_count) = -1;
         XG(active_symbol_table) = NULL;
         XG(This) = NULL;
         XG(last_exception_trace) = NULL;
@@ -1219,10 +1219,10 @@
         tmp->symbol_table = NULL;
         tmp->execute_data = NULL;
 
+ XG(function_count)++;
         if (edata && edata->op_array) {
                 /* Normal function calls */
                 tmp->filename = xdstrdup(edata->op_array->filename);
- XG(function_count)++;
         } else if (edata &&
                 edata->prev_execute_data &&
                 XDEBUG_LLIST_TAIL(XG(stack))
@@ -1239,7 +1239,6 @@
                                 tmp->filename = xdstrdup(((function_stack_entry*) XDEBUG_LLIST_VALP(XDEBUG_LLIST_TAIL(XG(stack))))->filename);
                         }
                 }
- XG(function_count)++;
         }
         if (!tmp->filename) {
                 /* Includes/main script etc */
Received on Sun Nov 22 2009 - 19:43:46 GMT