2010-04-07 Jb Evain <jbevain@novell.com>

	* main.c: don't overwrite method_name.

svn path=/trunk/mono/; revision=154966

diff --git a/mono/dis/ChangeLog b/mono/dis/ChangeLog
index 0d85d0636f43b61b11b6d4438f9a811ee7bc31bd..30b6a3f720cf808d31bbbe004fb028ad8957665a 100644 (file)
--- a/mono/dis/ChangeLog
+++ b/mono/dis/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-07  Jb Evain  <jbevain@novell.com>
+
+       * main.c: don't overwrite method_name.
+
 2010-04-06  Miguel de Icaza  <miguel@novell.com>
 
        * main.c: Prevent a crash with broken assemblies.

diff --git a/mono/dis/main.c b/mono/dis/main.c
index 2cc3844c9324e744cd2122a90240afc7abcfa48e..37d389b1bdb08ae6f830c3a03e1af2c5bc8fb314 100644 (file)
--- a/mono/dis/main.c
+++ b/mono/dis/main.c
@@ -862,9 +862,8 @@ dis_method_list (const char *klass_name, MonoImage *m, guint32 start, guint32 en
                if (ms != NULL){
                        sig_str = dis_stringify_method_signature (m, ms, i + 1, container, FALSE);
                        method_name = mono_metadata_string_heap (m, cols [MONO_METHOD_NAME]);
-
+               } else
                        method_name = g_strdup ("<NULL METHOD SIGNATURE>");
-               }
 
                fprintf (output, "    // method line %d\n", i + 1);
                fprintf (output, "    .method %s", flags);