Thu Mar 28 11:29:58 CET 2002 Paolo Molaro <lupus@ximian.com>

	* util.c: when an invalid flags combination is seen,
	return the string "invalid-flags", so disassembly can continue.

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

diff --git a/mono/dis/ChangeLog b/mono/dis/ChangeLog
index 3c202c4b1011714d848a10351dd1dde428de517c..17e73431a30d15d8bffd6a56a4e2499d75ba6675 100644 (file)
--- a/mono/dis/ChangeLog
+++ b/mono/dis/ChangeLog
@@ -1,4 +1,9 @@
 
+Thu Mar 28 11:29:58 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+       * util.c: when an invalid flags combination is seen,
+       return the string "invalid-flags", so disassembly can continue.
+
 Tue Mar 19 18:15:29 CET 2002 Paolo Molaro <lupus@ximian.com>
 
        * dis-cil.c: use unsigned for variables.

diff --git a/mono/dis/get.c b/mono/dis/get.c
index f7a4d1c1e0815149f86ed11953fda624b3e9c5e1..36cfb687d049ab51d39fc96c70cf1e2365b81825 100644 (file)
--- a/mono/dis/get.c
+++ b/mono/dis/get.c
@@ -1079,7 +1079,7 @@ get_constant (MonoImage *m, MonoTypeEnum t, guint32 blob_index)
                return g_strdup_printf ("%g", * (double *) ptr);
                
        case MONO_TYPE_STRING: {
-               int len, i, j, e;
+               int i, j, e;
                char *res;
                e = len = 0;
                for (i = 0; !ptr [i+1]; i += 2){

diff --git a/mono/dis/util.c b/mono/dis/util.c
index 004bbd683bcf4b38dcdb6f30a8267e270c5c2289..997f67fe2b77559f5cfb03b7f45c231b26ba2963 100644 (file)
--- a/mono/dis/util.c
+++ b/mono/dis/util.c
@@ -27,8 +27,7 @@ map (guint32 code, map_t *table)
        for (i = 0; table [i].str != NULL; i++)
                if (table [i].code == code)
                        return table [i].str;
-       g_assert_not_reached ();
-       return "";
+       return "invalid-flags";
 }
 
 /**