Mon Feb 17 13:13:31 CET 2003 Paolo Molaro <lupus@ximian.com>

	* image.c: explain the #- heap issue in a message, hopefully
	avoiding FAQs on mono-list.

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

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index 76eac056b433c005d134eaa01ceef50feaca40ec..f41160df020772daec8bb840b2559cc4a18806bc 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,9 @@
+
+Mon Feb 17 13:13:31 CET 2003 Paolo Molaro <lupus@ximian.com>
+
+       * image.c: explain the #- heap issue in a message, hopefully
+       avoiding FAQs on mono-list.
+
 2003-02-17  Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
        * icall.c:

diff --git a/mono/metadata/image.c b/mono/metadata/image.c
index a004e17266a041cb7ce5c5236be55d39e98416d7..97dfb1b6303944c20f26af11e27a945daee95168 100644 (file)
--- a/mono/metadata/image.c
+++ b/mono/metadata/image.c
@@ -290,6 +290,9 @@ load_metadata_ptrs (MonoImage *image, MonoCLIImageInfo *iinfo)
                        image->heap_guid.data = image->raw_metadata + read32 (ptr);
                        image->heap_guid.size = read32 (ptr + 4);
                        ptr += 8 + 6;
+               } else if (strncmp (ptr + 8, "#-", 3) == 0) {
+                       g_print ("Assembly '%s' has the non-standard metadata heap #-.\nRecompile it correctly (without the /incremental switch or in Release mode).", image->name);
+                       return FALSE;
                } else {
                        g_message ("Unknown heap type: %s\n", ptr + 8);
                        ptr += 8 + strlen (ptr) + 1;