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

derick Thu, 08 Jul 2010 08:11:14 +0000

Revision: http://svn.xdebug.org/cgi-bin/viewvc.cgi?view=rev&revision=3321&root=xdebug

Log:
- Fixed bug #592: Xdebug crashes with run after detach.

Changed paths:
    U xdebug/trunk/xdebug_handler_dbgp.c

Modified: xdebug/trunk/xdebug_handler_dbgp.c
===================================================================
--- xdebug/trunk/xdebug_handler_dbgp.c 2010-07-07 15:05:20 UTC (rev 3320)
+++ xdebug/trunk/xdebug_handler_dbgp.c 2010-07-08 08:11:14 UTC (rev 3321)
@@ -2463,15 +2463,17 @@
                 XG(stdio).php_header_write = NULL;
         }

- options = (xdebug_var_export_options*) context->options;
- xdfree(options->runtime);
- xdfree(context->options);
- xdebug_hash_destroy(context->function_breakpoints);
- xdebug_hash_destroy(context->exception_breakpoints);
- xdebug_hash_destroy(context->eval_id_lookup);
- xdebug_llist_destroy(context->line_breakpoints, NULL);
- xdebug_hash_destroy(context->breakpoint_list);
- xdfree(context->buffer);
+ if (XG(remote_enabled)) {
+ options = (xdebug_var_export_options*) context->options;
+ xdfree(options->runtime);
+ xdfree(context->options);
+ xdebug_hash_destroy(context->function_breakpoints);
+ xdebug_hash_destroy(context->exception_breakpoints);
+ xdebug_hash_destroy(context->eval_id_lookup);
+ xdebug_llist_destroy(context->line_breakpoints, NULL);
+ xdebug_hash_destroy(context->breakpoint_list);
+ xdfree(context->buffer);
+ }

         if (XG(remote_log_file)) {
                 char *timestr = xdebug_get_time();
@@ -2481,6 +2483,7 @@
                 fclose(XG(remote_log_file));
                 XG(remote_log_file) = NULL;
         }
+ XG(remote_enabled) = 0;
         return 1;
 }

Received on Thu Jul 08 2010 - 09:11:14 BST