2009-03-26 Rodrigo Kumpera <rkumpera@novell.com>

	* metadata-verify.c: Verify valid table bits.

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

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index fd9d36af6738368de83736021fbdd1763a8d5607..c3b7e87bc22822e8f12173c14b052d17d288a6a9 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,7 @@
+2009-03-26 Rodrigo Kumpera  <rkumpera@novell.com>
+
+       * metadata-verify.c: Verify valid table bits.
+
 2009-03-26 Rodrigo Kumpera  <rkumpera@novell.com>
 
        * metadata-verify.c (verify_metadata_header): Store size in the size field.

diff --git a/mono/metadata/metadata-verify.c b/mono/metadata/metadata-verify.c
index 720cdce7323f43b9319edabe9702eb8b175a45e5..abf886acf596cb00afd915f0d596dbb3ab28fcad 100644 (file)
--- a/mono/metadata/metadata-verify.c
+++ b/mono/metadata/metadata-verify.c
@@ -71,6 +71,10 @@ typedef struct {
        guint16 numberOfRelocations;
 } SectionHeader;
 
+typedef struct {
+       guint32 row_count;
+} TableInfo;
+
 typedef struct {
        const char *data;
        guint32 size;
@@ -81,6 +85,7 @@ typedef struct {
 
        DataDirectory data_directories [16];
        OffsetAndSize metadata_streams [5]; //offset from begin of the image
+       TableInfo tables [MONO_TABLE_NUM];
 } VerifyContext;
 
 #define ADD_VERIFY_INFO(__ctx, __msg, __status, __exception)   \
@@ -574,11 +579,33 @@ verify_tables_schema (VerifyContext *ctx)
        OffsetAndSize tables_area = ctx->metadata_streams [TILDE_STREAM];
        unsigned offset = tables_area.offset;
        const char *ptr = ctx->data + offset;
+       guint64 valid_tables;
+       guint32 count;
+       int i;
+
+       if (tables_area.size < 24)
+               ADD_ERROR (ctx, g_strdup_printf ("Table schemata size (%d) too small to for initial decoding (requires 24 bytes)", tables_area.size));
 
        if (ptr [4] != 2)
                ADD_ERROR (ctx, g_strdup_printf ("Invalid table schemata major version %d, expected 2", ptr [4]));
        if (ptr [5] != 0)
                ADD_ERROR (ctx, g_strdup_printf ("Invalid table schemata minor version %d, expected 0", ptr [5]));
+
+       valid_tables = read64 (ptr + 8);
+       count = 0;
+       for (i = 0; i < 64; ++i) {
+               if (!(valid_tables & ((guint64)1 << i)))
+                       continue;
+
+               /*MS Extensions: 0x3 0x5 0x7 0x13 0x16
+                 Unused: 0x1E 0x1F 0x2D-0x3F
+                 We don't care about the MS extensions.*/
+               if (i == 0x3 || i == 0x5 || i == 0x7 || i == 0x13 || i == 0x16)
+                       ADD_ERROR (ctx, g_strdup_printf ("The metadata verifies doesn't support MS specific table %x", i));
+               if (i == 0x1E || i == 0x1F || i >= 0x2D)
+                       ADD_ERROR (ctx, g_strdup_printf ("Invalid table %x", i));
+               ++count;
+       }
 }