From 86de6db8291406ead6966ae5b4203a6ee3047a8e Mon Sep 17 00:00:00 2001 From: jbevain Date: Sun, 20 Jun 2010 13:14:29 +0000 Subject: [PATCH] 2010-06-20 Jb Evain * metadata-verify.c: do not consider the assembly invalid if it doesn't have a #Blob stream as resource assemblies don't necessarily have one. git-svn-id: svn+ssh://mono-cvs.ximian.com/source/trunk/mono@159181 e3ebcda4-bce8-0310-ba0a-eca2169e7518 --- mono/metadata/ChangeLog | 6 ++++++ mono/metadata/metadata-verify.c | 7 ++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog index 2c1559444..6f7d17e60 100644 --- a/mono/metadata/ChangeLog +++ b/mono/metadata/ChangeLog @@ -1,3 +1,9 @@ +2010-06-20 Jb Evain + + * metadata-verify.c: do not consider the assembly invalid if it + doesn't have a #Blob stream as resource assemblies don't + necessarily have one. + 2010-06-17 Geoff Norton * sgen-archdep.h: sgen support for arm linux and darwin. diff --git a/mono/metadata/metadata-verify.c b/mono/metadata/metadata-verify.c index 625692c77..e37ef43a0 100644 --- a/mono/metadata/metadata-verify.c +++ b/mono/metadata/metadata-verify.c @@ -780,8 +780,8 @@ verify_metadata_header (VerifyContext *ctx) ptr = ctx->data + offset; //move to streams header section_count = read16 (ptr + 2); - if (section_count < 3) - ADD_ERROR (ctx, g_strdup_printf ("Metadata root section must have at least 3 streams (#~, #GUID and #Blob")); + if (section_count < 2) + ADD_ERROR (ctx, g_strdup_printf ("Metadata root section must have at least 2 streams (#~ and #GUID)")); ptr += 4; offset += 4; @@ -843,9 +843,6 @@ verify_metadata_header (VerifyContext *ctx) ADD_ERROR (ctx, g_strdup_printf ("Metadata #~ stream missing")); if (!ctx->metadata_streams [GUID_STREAM].size) ADD_ERROR (ctx, g_strdup_printf ("Metadata guid stream missing")); - if (!ctx->metadata_streams [BLOB_STREAM].size) - ADD_ERROR (ctx, g_strdup_printf ("Metadata blob stream missing")); - } static void -- 2.11.4.GIT