[xdebug-dev] svn: /xdebug/trunk/ xdebug_handler_dbgp.c

derick Tue, 05 Jan 2010 17:36:50 +0000

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

Log:
- Fixed memory leak in breakpoint handling.

Changed paths:
    U xdebug/trunk/xdebug_handler_dbgp.c

Modified: xdebug/trunk/xdebug_handler_dbgp.c
===================================================================
--- xdebug/trunk/xdebug_handler_dbgp.c 2010-01-05 14:03:37 UTC (rev 3203)
+++ xdebug/trunk/xdebug_handler_dbgp.c 2010-01-05 17:36:50 UTC (rev 3204)
@@ -874,6 +874,7 @@
         xdebug_llist_element *le;
         xdebug_brk_info *brk = NULL;
         xdebug_arg *parts = (xdebug_arg*) xdmalloc(sizeof(xdebug_arg));
+ int retval = FAILURE;
         TSRMLS_FETCH();

         switch (type) {
@@ -889,7 +890,8 @@

                                 if (atoi(parts->args[1]) == brk->lineno && memcmp(brk->file, parts->args[0], brk->file_len) == 0) {
                                         xdebug_llist_remove(XG(context).line_breakpoints, le, NULL);
- return SUCCESS;
+ retval = SUCCESS;
+ break;
                                 }
                         }

@@ -899,17 +901,17 @@

                 case BREAKPOINT_TYPE_FUNCTION:
                         if (xdebug_hash_delete(XG(context).function_breakpoints, hkey, strlen(hkey))) {
- return SUCCESS;
+ retval = SUCCESS;
                         }
                         break;

                 case BREAKPOINT_TYPE_EXCEPTION:
                         if (xdebug_hash_delete(XG(context).exception_breakpoints, hkey, strlen(hkey))) {
- return SUCCESS;
+ retval = SUCCESS;
                         }
                         break;
         }
- return FAILURE;
+ return retval;
 }

 #define BREAKPOINT_ACTION_GET 1
Received on Tue Jan 05 2010 - 17:36:50 GMT