diff options
| author | Rodrigo Kumpera <kumpera@gmail.com> | 2016-07-08 00:09:30 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-08 00:09:30 +0300 |
| commit | e23589a6cf64e05734d461fec8f46ccaba4884bf (patch) | |
| tree | e1a0f68beaea212ca87ab1f17b8cebeb87290d0f | |
| parent | 8694ee1f46983fbdbf6d69a28d4c630e19685e46 (diff) | |
| parent | 2a8146f2876410216412ef8580452e35f961f2e8 (diff) | |
Merge pull request #3250 from jbevain/cli-flags
Fix definition and handling of the Preferred32bit CLI flag in the verifier
| -rw-r--r-- | mono/metadata/cil-coff.h | 2 | ||||
| -rw-r--r-- | mono/metadata/metadata-verify.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mono/metadata/cil-coff.h b/mono/metadata/cil-coff.h index 26b4782ca5a..8581a042f2c 100644 --- a/mono/metadata/cil-coff.h +++ b/mono/metadata/cil-coff.h @@ -295,8 +295,8 @@ typedef struct { #define CLI_FLAGS_ILONLY 0x01 #define CLI_FLAGS_32BITREQUIRED 0x02 #define CLI_FLAGS_STRONGNAMESIGNED 0x8 -#define CLI_FLAGS_PREFERRED32BIT 0x10 #define CLI_FLAGS_TRACKDEBUGDATA 0x00010000 +#define CLI_FLAGS_PREFERRED32BIT 0x00020000 guint32 ch_flags; guint32 ch_entry_point; diff --git a/mono/metadata/metadata-verify.c b/mono/metadata/metadata-verify.c index 287c68fbfb7..2c5612c2a1d 100644 --- a/mono/metadata/metadata-verify.c +++ b/mono/metadata/metadata-verify.c @@ -730,7 +730,7 @@ verify_cli_header (VerifyContext *ctx) if (!read32 (ptr + 8) || !read32 (ptr + 12)) ADD_ERROR (ctx, g_strdup_printf ("Missing medatata section in the CLI header")); - if ((read32 (ptr + 16) & ~0x0001000B) != 0) + if ((read32 (ptr + 16) & ~0x0003000B) != 0) ADD_ERROR (ctx, g_strdup_printf ("Invalid CLI header flags")); ptr += 24; |