2009-01-12 Rodrigo Kumpera <[email protected]>

	* metadata-verify.c: Add pe header watermark verification.

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

mono/metadata/ChangeLog

@@ -1,3 +1,7 @@
+2009-01-12 Rodrigo Kumpera  <[email protected]>
+
+	* metadata-verify.c: Add pe header watermark verification.
+
 2009-01-09 Rodrigo Kumpera  <[email protected]>
 
 	* metadata-verify.c: Add lfanew verification.

mono/metadata/metadata-verify.c

@@ -54,6 +54,13 @@ verify_msdos_header (VerifyContext *ctx)
 		ADD_ERROR (ctx,  g_strdup ("MS-DOS lfanew offset points to outside of the file"));
 }
 
+static void
+verify_pe_header (VerifyContext *ctx)
+{
+	const char *pe_header = ctx->data + read32 (ctx->data + 0x3c);
+	if (pe_header [0] != 'P' || pe_header [1] != 'E' ||pe_header [2] != 0 ||pe_header [3] != 0)
+		ADD_ERROR (ctx,  g_strdup ("Invalid PE header watermark"));
+}
 
 GSList*
 mono_image_verify (const char *data, guint32 size)
@@ -66,6 +73,8 @@ mono_image_verify (const char *data, guint32 size)
 
 	verify_msdos_header (&ctx);
 	CHECK_STATE();
+	verify_pe_header (&ctx);
+	CHECK_STATE();
 
 cleanup:
 	return ctx.errors;