Add some non standard bits to metadata verifier.

2010-07-27 Rodrigo Kumpera  <rkumpera@novell.com>

	* metadata-verify.c (INVALID_IMPLMAP_FLAGS_BITS): Add non standard
	bits for best fit on/off (4,5) and throw on unmappable on/off (12/13).

	Fixes #622221.

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index d78f55430852b30f93e085358a9c59a9a084103c..2f380445207b3b8cd273ce7507ccbc7752c509d7 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,10 @@
+2010-07-27 Rodrigo Kumpera  <rkumpera@novell.com>
+
+       * metadata-verify.c (INVALID_IMPLMAP_FLAGS_BITS): Add non standard
+       bits for best fit on/off (4,5) and throw on unmappable on/off (12/13).
+
+       Fixes #622221.
+
 2010-07-27  Geoff Norton  <gnorton@novell.com>
 
        * sgen-archdep.h: Ensure we store the registers we actually

diff --git a/mono/metadata/metadata-verify.c b/mono/metadata/metadata-verify.c
index e37ef43a0245f8e4ee7bb487bf4ca7532e0b7015..c5c418c3562625d762fbbc48c6fa4f479ccb674c 100644 (file)
--- a/mono/metadata/metadata-verify.c
+++ b/mono/metadata/metadata-verify.c
@@ -3261,7 +3261,7 @@ verify_typespec_table_full (VerifyContext *ctx)
        ctx->token = 0;
 }
 
-#define INVALID_IMPLMAP_FLAGS_BITS ~((1 << 0) | (1 << 1) | (1 << 2) | (1 << 6) | (1 << 8) | (1 << 9) | (1 << 10))
+#define INVALID_IMPLMAP_FLAGS_BITS ~((1 << 0) | (1 << 1) | (1 << 2) | (1 << 4) | (1 << 5) | (1 << 6) | (1 << 8) | (1 << 9) | (1 << 10) | (1 << 12) | (1 << 13))
 static void
 verify_implmap_table (VerifyContext *ctx)
 {