X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmetadata%2Fdebug-helpers.c;h=f38a054125710fab5281f9e0facb68b7aa1e5e4f;hb=37e3c51b13ccfc964103ae2bcfe7a5aeb7008bd7;hp=1cf21e31b702c20ca165a913ad217e7c8ce2a745;hpb=0717f141b92db56481cc09af70c026d7ffad8921;p=mono.git

diff --git a/mono/metadata/debug-helpers.c b/mono/metadata/debug-helpers.c
index 1cf21e31b70..f38a0541257 100644
--- a/mono/metadata/debug-helpers.c
+++ b/mono/metadata/debug-helpers.c
@@ -1,5 +1,5 @@
 /*
- * console-io.c: ConsoleDriver internal calls
+ * debug-helpers.c:
  *
  * Author:
  *	Mono Project (http://www.mono-project.com)
@@ -326,10 +326,10 @@ mono_method_desc_new (const char *name, gboolean include_namespace)
 		g_free (class_nspace);
 		return NULL;
 	}
-	*method_name++ = 0;
 	/* allow two :: to separate the method name */
-	if (*method_name == ':')
-		method_name++;
+	if (method_name != class_nspace && method_name [-1] == ':')
+		method_name [-1] = 0;
+	*method_name++ = 0;
 	class_name = strrchr (class_nspace, '.');
 	if (class_name) {
 		*class_name++ = 0;
@@ -1003,7 +1003,7 @@ mono_class_describe_statics (MonoClass* klass)
 
 	if (!vtable)
 		return;
-	if (!(addr = vtable->data))
+	if (!(addr = mono_vtable_get_static_field_data (vtable)))
 		return;
 
 	for (p = klass; p != NULL; p = p->parent) {
@@ -1020,4 +1020,3 @@ mono_class_describe_statics (MonoClass* klass)
 		}
 	}
 }
-