[xdebug-dev] xdebug xdebug/xdebug_handler_dbgp.c - Fixed bug #368: Xdebug's debugger bails out on a parse error with the eval

Date: Sat Oct 17 18:40:43 CEST 2009
User: Derick Rethans
Directory: xdebug

Log Message:
[0.50]
- Fixed bug #368: Xdebug's debugger bails out on a parse error with the eval
  command.

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

[FILE: /xdebug/xdebug_handler_dbgp.c]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- xdebug/xdebug_handler_dbgp.c:1.142 Mon Oct 12 06:21:31 2009 GMT
+++ xdebug/xdebug_handler_dbgp.c Sat Oct 17 14:40:43 2009 GMT
@@ -1206,7 +1206,9 @@
         /* base64 decode eval string */
         eval_string = (char*) xdebug_base64_decode((unsigned char*) CMD_OPTION('-'), strlen(CMD_OPTION('-')), &new_length);
 
- res = xdebug_do_eval(eval_string, &ret_zval TSRMLS_CC);
+ zend_try {
+ res = xdebug_do_eval(eval_string, &ret_zval TSRMLS_CC);
+ } zend_end_try();
 
         efree(eval_string);
 
@@ -2282,7 +2284,7 @@
 
 char *xdebug_dbgp_get_revision(void)
 {
- return "$Revision: 1.142 $";
+ return "$Revision: 1.143 $";
 }
 
 static int xdebug_dbgp_cmdloop(xdebug_con *context, int bail TSRMLS_DC)
Received on Sat Oct 17 2009 - 18:40:59 BST