[xdebug-dev] xdebug xdebug/xdebug_handler_dbgp.c - Fixed some issues with finding out the classname, which is important for

Date: Thu Dec 7 01:21:26 CET 2006
User: Derick Rethans
Directory: xdebug

Log Message:
[0.50]
- Fixed some issues with finding out the classname, which is important for
  fetching private properties.

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

[FILE: /xdebug/xdebug_handler_dbgp.c]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- xdebug/xdebug_handler_dbgp.c:1.107 Fri Dec 01 18:38:21 2006 GMT
+++ xdebug/xdebug_handler_dbgp.c Wed Dec 06 23:21:26 2006 GMT
@@ -458,10 +458,11 @@
                                                         keyword_end = *p;
                                                         if (keyword) {
                                                                 retval = fetch_zval_from_symbol_table(st, keyword, keyword_end - keyword, type, current_classname, cc_length TSRMLS_CC);
+ if (current_classname) {
+ efree(current_classname);
+ }
+ current_classname = NULL;
                                                                 if (retval) {
- if (current_classname) {
- efree(current_classname);
- }
                                                                         current_classname = fetch_classname_from_zval(retval, &cc_length TSRMLS_CC);
                                                                         st = fetch_ht_from_zval(retval TSRMLS_CC);
                                                                 }
@@ -503,6 +504,7 @@
                                                         }
                                                         current_classname = NULL;
                                                         if (retval) {
+ current_classname = fetch_classname_from_zval(retval, &cc_length TSRMLS_CC);
                                                                 st = fetch_ht_from_zval(retval TSRMLS_CC);
                                                         }
                                                         keyword = NULL;
@@ -521,8 +523,9 @@
                                                         if (current_classname) {
                                                                 efree(current_classname);
                                                         }
- current_classname = fetch_classname_from_zval(retval, &cc_length TSRMLS_CC);
+ current_classname = NULL;
                                                         if (retval) {
+ current_classname = fetch_classname_from_zval(retval, &cc_length TSRMLS_CC);
                                                                 st = fetch_ht_from_zval(retval TSRMLS_CC);
                                                         }
                                                         keyword = NULL;
@@ -2118,7 +2121,7 @@
 
 char *xdebug_dbgp_get_revision(void)
 {
- return "$Revision: 1.107 $";
+ return "$Revision: 1.108 $";
 }
 
 int xdebug_dbgp_cmdloop(xdebug_con *context TSRMLS_DC)
Received on Thu Dec 07 2006 - 01:21:42 GMT