[xdebug-dev] xdebug xdebug/xdebug_handler_dbgp.c - Fixed crash bug when dbgp_deinit was called before any other command

Date: Sat Jul 10 14:58:30 CEST 2004
User: Derick Rethans
Directory: xdebug

Log Message:
[0.50]
- Fixed crash bug when dbgp_deinit was called before any other command
  was given to the debug engine.

Modified files:
           xdebug/xdebug_handler_dbgp.c (version: 1.46)

[FILE: /xdebug/xdebug_handler_dbgp.c]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- xdebug/xdebug_handler_dbgp.c:1.45 Fri Jul 09 11:36:39 2004 GMT
+++ xdebug/xdebug_handler_dbgp.c Sat Jul 10 10:58:30 2004 GMT
@@ -1534,7 +1534,7 @@
 
 char *xdebug_dbgp_get_revision(void)
 {
- return "$Revision: 1.45 $";
+ return "$Revision: 1.46 $";
 }
 
 int xdebug_dbgp_cmdloop(xdebug_con *context TSRMLS_DC)
@@ -1659,8 +1659,12 @@
         XG(status) = DBGP_STATUS_STOPPED;
         XG(reason) = DBGP_REASON_OK;
         response = xdebug_xml_node_init("response");
- xdebug_xml_add_attribute_ex(response, "command", XG(lastcmd), 0, 0);
- xdebug_xml_add_attribute_ex(response, "transaction_id", XG(lasttransid), 0, 0);
+ /* lastcmd and lasttransid are not always set (for example when the
+ * connection is severed before the first command is send) */
+ if (XG(lastcmd) && XG(lasttransid)) {
+ xdebug_xml_add_attribute_ex(response, "command", XG(lastcmd), 0, 0);
+ xdebug_xml_add_attribute_ex(response, "transaction_id", XG(lasttransid), 0, 0);
+ }
         xdebug_xml_add_attribute_ex(response, "status", xdebug_dbgp_status_strings[XG(status)], 0, 0);
         xdebug_xml_add_attribute_ex(response, "reason", xdebug_dbgp_reason_strings[XG(reason)], 0, 0);
 
Received on Sat Jul 10 2004 - 14:58:37 BST