[xdebug-dev] xdebug xdebug/xdebug.c xdebug/xdebug_handler_dbgp.c - Fixed bug #141: Remote context_get causes segfault.

Date: Sat Dec 31 11:34:52 CET 2005
User: Derick Rethans
Directory: xdebug

Log Message:
[1.50]
- Fixed bug #141: Remote context_get causes segfault.

Modified files:
           xdebug/xdebug.c (version: 1.287)
           xdebug/xdebug_handler_dbgp.c (version: 1.74)

[FILE: /xdebug/xdebug.c]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -r1.286 -r1.287
--- xdebug/xdebug.c:1.286 Fri Dec 30 14:54:24 2005 GMT
+++ xdebug/xdebug.c Sat Dec 31 09:34:52 2005 GMT
@@ -661,6 +661,7 @@
         XG(error_handler) = NULL;
         XG(prev_memory) = 0;
         XG(function_count) = 0;
+ XG(active_symbol_table) = NULL;
         
         if (idekey && *idekey) {
                 if (XG(ide_key)) {
@@ -890,6 +891,7 @@
         tmp->include_filename = NULL;
         tmp->profile.call_list = xdebug_llist_alloc(profile_call_entry_dtor);
         tmp->op_array = op_array;
+ tmp->symbol_table = NULL;
 
         if (EG(current_execute_data) && EG(current_execute_data)->op_array) {
                 /* Normal function calls */

[FILE: /xdebug/xdebug_handler_dbgp.c]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- xdebug/xdebug_handler_dbgp.c:1.73 Thu Aug 04 12:04:30 2005 GMT
+++ xdebug/xdebug_handler_dbgp.c Sat Dec 31 09:34:52 2005 GMT
@@ -1371,7 +1371,7 @@
         HashTable *tmp_symbol_table;
 
         contents = get_symbol(name, name_length TSRMLS_CC);
- if (!contents && !no_eval) {
+ if (!contents && !no_eval && XG(active_symbol_table)) {
                 char *varname = NULL;
                 if (var_only && name[0] != '$' && !strstr(name, "::$")) {
                         varname = xdebug_sprintf("$%s", name);
@@ -1891,7 +1891,7 @@
 
 char *xdebug_dbgp_get_revision(void)
 {
- return "$Revision: 1.73 $";
+ return "$Revision: 1.74 $";
 }
 
 int xdebug_dbgp_cmdloop(xdebug_con *context TSRMLS_DC)
Received on Sat Dec 31 2005 - 11:34:57 GMT