[xdebug-dev] xdebug xdebug/xdebug.c xdebug/xdebug_code_coverage.c xdebug/xdebug_handler_dbgp.c xdebug/xdebug_handler_dbgp.h xdebug/xdebug_handler_gdb.c xdebug/xdebug_handler_gdb.h xdebug/xdebug_handlers.h - MFH: Fixed bug #439: Xdebug crash in xdebug_header_handler.

Date: Sat Jul 4 16:31:59 CEST 2009
User: Derick Rethans
Directory: xdebug

Log Message:
[0.50]
- MFH: Fixed bug #439: Xdebug crash in xdebug_header_handler.
#- There were API changes in PHp 5.3 that I missed.
- MFH: Fixed random GCC warnings.

Modified files:
           xdebug/xdebug.c (version: 1.400.2.22)
           xdebug/xdebug_code_coverage.c (version: 1.32.2.16)
           xdebug/xdebug_handler_dbgp.c (version: 1.125.2.7)
           xdebug/xdebug_handler_dbgp.h (version: 1.20.2.2)
           xdebug/xdebug_handler_gdb.c (version: 1.87.2.1)
           xdebug/xdebug_handler_gdb.h (version: 1.31.2.1)
           xdebug/xdebug_handlers.h (version: 1.36.2.1)

[FILE: /xdebug/xdebug.c]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.400.2.21
retrieving revision 1.400.2.22
diff -u -r1.400.2.21 -r1.400.2.22
--- xdebug/xdebug.c:1.400.2.21 Fri Jul 03 13:56:08 2009 GMT
+++ xdebug/xdebug.c Sat Jul 04 12:31:59 2009 GMT
@@ -2709,7 +2709,7 @@
                         if (debugzval) {
                                 printf("%s: ", Z_STRVAL_PP(args[i]));
                                 val = xdebug_get_zval_value(debugzval, 1, NULL);
- printf("%s(%d)", val, strlen(val));
+ printf("%s(%zd)", val, strlen(val));
                                 xdfree(val);
                                 printf("\n");
                         }
@@ -2858,7 +2858,7 @@
                         u_time = xdebug_get_utime();
                         fprintf(XG(trace_file), XG(trace_format) == 0 ? "%10.4f " : "\t\t\t%f\t", u_time - XG(start_time));
 #if HAVE_PHP_MEMORY_USAGE
- fprintf(XG(trace_file), XG(trace_format) == 0 ? "%10u" : "%lu", XG_MEMORY_USAGE());
+ fprintf(XG(trace_file), XG(trace_format) == 0 ? "%10zu" : "%lu", XG_MEMORY_USAGE());
 #else
                         fprintf(XG(trace_file), XG(trace_format) == 0 ? "%10u" : "", 0);
 #endif

[FILE: /xdebug/xdebug_code_coverage.c]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.32.2.15
retrieving revision 1.32.2.16
diff -u -r1.32.2.15 -r1.32.2.16
--- xdebug/xdebug_code_coverage.c:1.32.2.15 Sat Mar 28 18:37:26 2009 GMT
+++ xdebug/xdebug_code_coverage.c Sat Jul 04 12:31:59 2009 GMT
@@ -231,9 +231,6 @@
 
 static void prefill_from_oparray(char *fn, zend_op_array *opa TSRMLS_DC)
 {
- char cache_key[256];
- int cache_key_len;
- void *dummy;
         unsigned int i;
         xdebug_set *set = NULL;
 

[FILE: /xdebug/xdebug_handler_dbgp.c]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.125.2.6
retrieving revision 1.125.2.7
diff -u -r1.125.2.6 -r1.125.2.7
--- xdebug/xdebug_handler_dbgp.c:1.125.2.6 Tue May 27 10:40:21 2008 GMT
+++ xdebug/xdebug_handler_dbgp.c Sat Jul 04 12:31:59 2009 GMT
@@ -2216,7 +2216,7 @@
 
 char *xdebug_dbgp_get_revision(void)
 {
- return "$Revision: 1.125.2.6 $";
+ return "$Revision: 1.125.2.7 $";
 }
 
 static int xdebug_dbgp_cmdloop(xdebug_con *context, int bail TSRMLS_DC)
@@ -2492,7 +2492,7 @@
         return 1;
 }
 
-int xdebug_dbgp_breakpoint(xdebug_con *context, xdebug_llist *stack, const char *file, long lineno, int type, char *exception, char *message)
+int xdebug_dbgp_breakpoint(xdebug_con *context, xdebug_llist *stack, char *file, long lineno, int type, char *exception, char *message)
 {
         xdebug_xml_node *response, *error_container;
         TSRMLS_FETCH();

[FILE: /xdebug/xdebug_handler_dbgp.h]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.20.2.1
retrieving revision 1.20.2.2
diff -u -r1.20.2.1 -r1.20.2.2
--- xdebug/xdebug_handler_dbgp.h:1.20.2.1 Wed Feb 13 11:12:20 2008 GMT
+++ xdebug/xdebug_handler_dbgp.h Sat Jul 04 12:31:59 2009 GMT
@@ -91,7 +91,7 @@
 int xdebug_dbgp_init(xdebug_con *context, int mode);
 int xdebug_dbgp_deinit(xdebug_con *context);
 int xdebug_dbgp_error(xdebug_con *context, int type, char *exception_type, char *message, const char *location, const uint line, xdebug_llist *stack);
-int xdebug_dbgp_breakpoint(xdebug_con *context, xdebug_llist *stack, const char *file, long lineno, int type, char *exception, char *message);
+int xdebug_dbgp_breakpoint(xdebug_con *context, xdebug_llist *stack, char *file, long lineno, int type, char *exception, char *message);
 int xdebug_dbgp_register_eval_id(xdebug_con *context, function_stack_entry *fse);
 int xdebug_dbgp_unregister_eval_id(xdebug_con *context, function_stack_entry *fse, int eval_id);
 char *xdebug_dbgp_get_revision(void);

[FILE: /xdebug/xdebug_handler_gdb.c]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.87
retrieving revision 1.87.2.1
diff -u -r1.87 -r1.87.2.1
--- xdebug/xdebug_handler_gdb.c:1.87 Fri Mar 09 11:35:37 2007 GMT
+++ xdebug/xdebug_handler_gdb.c Sat Jul 04 12:31:59 2009 GMT
@@ -1351,7 +1351,7 @@
 
 char *xdebug_gdb_get_revision(void)
 {
- return "$Revision: 1.87 $";
+ return "$Revision: 1.87.2.1 $";
 }
 
 int xdebug_gdb_init(xdebug_con *context, int mode)
@@ -1463,7 +1463,7 @@
         return 1;
 }
 
-int xdebug_gdb_breakpoint(xdebug_con *context, xdebug_llist *stack, const char *file, long lineno, int type, char *exception_type, char *message)
+int xdebug_gdb_breakpoint(xdebug_con *context, xdebug_llist *stack, char *file, long lineno, int type, char *exception_type, char *message)
 {
         function_stack_entry *i;
         int ret;

[FILE: /xdebug/xdebug_handler_gdb.h]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.31
retrieving revision 1.31.2.1
diff -u -r1.31 -r1.31.2.1
--- xdebug/xdebug_handler_gdb.h:1.31 Mon Feb 26 13:43:30 2007 GMT
+++ xdebug/xdebug_handler_gdb.h Sat Jul 04 12:31:59 2009 GMT
@@ -73,7 +73,7 @@
 int xdebug_gdb_init(xdebug_con *context, int mode);
 int xdebug_gdb_deinit(xdebug_con *context);
 int xdebug_gdb_error(xdebug_con *context, int type, char *exception_type, char *message, const char *file, const uint lineno, xdebug_llist *stack);
-int xdebug_gdb_breakpoint(xdebug_con *context, xdebug_llist *stack, const char *file, long lineno, int type, char *exception_type, char *message);
+int xdebug_gdb_breakpoint(xdebug_con *context, xdebug_llist *stack, char *file, long lineno, int type, char *exception_type, char *message);
 char *xdebug_gdb_get_revision(void);
 
 #define xdebug_handler_gdb { \

[FILE: /xdebug/xdebug_handlers.h]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.36
retrieving revision 1.36.2.1
diff -u -r1.36 -r1.36.2.1
--- xdebug/xdebug_handlers.h:1.36 Mon Feb 26 13:43:30 2007 GMT
+++ xdebug/xdebug_handlers.h Sat Jul 04 12:31:59 2009 GMT
@@ -112,7 +112,7 @@
         int (*remote_error)(xdebug_con *h, int type, char *exception_type, char *message, const char *location, const uint line, xdebug_llist *stack);
 
         /* Breakpoints */
- int (*remote_breakpoint)(xdebug_con *h, xdebug_llist *stack, const char *file, long lineno, int type, char *exception, char *message);
+ int (*remote_breakpoint)(xdebug_con *h, xdebug_llist *stack, char *file, long lineno, int type, char *exception, char *message);
 
         /* Eval ID registration and removal */
         int (*register_eval_id)(xdebug_con *h, function_stack_entry *fse);
Received on Sat Jul 04 2009 - 16:32:02 BST