[xdebug-dev] xdebug xdebug/php_xdebug.h xdebug/xdebug.c - Plugged some memory leaks

Date: Mon Sep 27 10:33:42 CEST 2004
User: Derick Rethans
Directory: xdebug

Log Message:
[2.50]
- Plugged some memory leaks
- Fixed a segfault
- Updated the version number

Modified files:
           xdebug/php_xdebug.h (version: 1.80)
           xdebug/xdebug.c (version: 1.238)

[FILE: /xdebug/php_xdebug.h]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- xdebug/php_xdebug.h:1.79 Wed Sep 15 10:59:49 2004 GMT
+++ xdebug/php_xdebug.h Mon Sep 27 06:33:42 2004 GMT
@@ -20,7 +20,7 @@
 #define PHP_XDEBUG_H
 
 #define XDEBUG_NAME "Xdebug"
-#define XDEBUG_VERSION "2.0.0beta1"
+#define XDEBUG_VERSION "2.0.0beta2-dev"
 #define XDEBUG_AUTHOR "Derick Rethans"
 #define XDEBUG_COPYRIGHT "Copyright (c) 2002-2004 by Derick Rethans"
 #define XDEBUG_URL "http://xdebug.org"

[FILE: /xdebug/xdebug.c]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -r1.237 -r1.238
--- xdebug/xdebug.c:1.237 Wed Sep 22 11:49:38 2004 GMT
+++ xdebug/xdebug.c Mon Sep 27 06:33:42 2004 GMT
@@ -483,6 +483,7 @@
                                         xdfree(e->var[i].name);
                                 }
                         }
+ xdfree(e->var);
                 }
 
                 if (e->include_filename) {
@@ -539,7 +540,9 @@
         XG(profiler_enabled) = 0;
         XG(breakpoints_allowed) = 1;
         if (XG(auto_trace) && XG(trace_output_dir) && strlen(XG(trace_output_dir))) {
- xdebug_start_trace(NULL, XG(trace_options) TSRMLS_CC);
+ /* In case we do an auto-trace we are not interested in the return
+ * value, but we still have to free it. */
+ xdfree(xdebug_start_trace(NULL, XG(trace_options) TSRMLS_CC));
         }
 
         /* Initialize some debugger context properties */
@@ -790,11 +793,12 @@
                         zval *param;
                         int is_var;
 
- param = get_zval(&zdata->opline->op1, zdata->Ts, &is_var);
- tmp->var = xdmalloc(sizeof (xdebug_var));
+/* tmp->var = xdmalloc(sizeof (xdebug_var));
                         tmp->var[tmp->varc].name = NULL;
                         tmp->var[tmp->varc].addr = param;
                         tmp->varc++;
+*/
+ tmp->include_filename = get_zval_value(get_zval(&zdata->opline->op1, zdata->Ts, &is_var));
                 } else if (XG(collect_includes)) {
                         tmp->include_filename = xdstrdup(zend_get_executed_filename(TSRMLS_C));
                 }
@@ -1301,7 +1305,7 @@
                                 int scope_nr = XG(stack)->size;
                                 
                                 i = XDEBUG_LLIST_VALP(XDEBUG_LLIST_TAIL(XG(stack)));
- if (i->user_defined == XDEBUG_INTERNAL && XDEBUG_LLIST_VALP(XDEBUG_LLIST_PREV(XDEBUG_LLIST_TAIL(XG(stack))))) {
+ if (i->user_defined == XDEBUG_INTERNAL && XDEBUG_LLIST_PREV(XDEBUG_LLIST_TAIL(XG(stack))) && XDEBUG_LLIST_VALP(XDEBUG_LLIST_PREV(XDEBUG_LLIST_TAIL(XG(stack))))) {
                                         i = XDEBUG_LLIST_VALP(XDEBUG_LLIST_PREV(XDEBUG_LLIST_TAIL(XG(stack))));
                                         scope_nr--;
                                 }
Received on Mon Sep 27 2004 - 10:33:52 BST