diff options
| author | Aleksey Kliger (λgeek) <akliger@gmail.com> | 2017-03-17 02:09:00 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-17 02:09:00 +0300 |
| commit | b8285f3c9951354be07f693dd5996790d5764e3a (patch) | |
| tree | b878739c3c867f403823b8a71318e09f17dc3cce /tools | |
| parent | 395814d25f83f4d814f1a7c54793fb16fe3209eb (diff) | |
| parent | 99a0b4632754d5b87c6f2460ce43893f9c5399a2 (diff) | |
Merge pull request #4453 from lambdageek/bug-49721
[loader] Check strong name when loading from application base. (Fixes #49721)
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/pedump/pedump.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/pedump/pedump.c b/tools/pedump/pedump.c index 6ae2a1e1e49..072b535f299 100644 --- a/tools/pedump/pedump.c +++ b/tools/pedump/pedump.c @@ -21,7 +21,7 @@ #include <mono/metadata/debug-helpers.h> #include <mono/metadata/tokentype.h> #include <mono/metadata/appdomain.h> -#include <mono/metadata/assembly.h> +#include <mono/metadata/assembly-internals.h> #include <mono/metadata/metadata-internals.h> #include <mono/metadata/class-internals.h> #include <mono/metadata/verify-internals.h> @@ -523,7 +523,7 @@ try_load_from (MonoAssembly **assembly, const gchar *path1, const gchar *path2, *assembly = NULL; fullpath = g_build_filename (path1, path2, path3, path4, NULL); if (g_file_test (fullpath, G_FILE_TEST_IS_REGULAR)) - *assembly = mono_assembly_open_full (fullpath, NULL, refonly); + *assembly = mono_assembly_open_predicate (fullpath, refonly, FALSE, NULL, NULL, NULL); g_free (fullpath); return (*assembly != NULL); @@ -727,7 +727,7 @@ main (int argc, char *argv []) mono_verifier_set_mode (verifier_mode); - assembly = mono_assembly_open (file, NULL); + assembly = mono_assembly_open_predicate (file, FALSE, FALSE, NULL, NULL, NULL); /*fake an assembly for netmodules so the verifier works*/ if (!assembly && (image = mono_image_open (file, &status)) && image->tables [MONO_TABLE_ASSEMBLY].rows == 0) { assembly = g_new0 (MonoAssembly, 1); |