diff options
| author | monojenkins <jo.shields+jenkins@xamarin.com> | 2020-04-02 19:39:10 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-02 19:39:10 +0300 |
| commit | 54e6ca20b4e625fe3b2d3ac85ec2c180242c1685 (patch) | |
| tree | 457ed5d634c4ca48bb1463a9d11b6608a16b7dc6 /tools | |
| parent | 82dc6e8a5ed7347fc94245c92f60490e5f4e262a (diff) | |
[loader] Add append option to loader hook installation functions (#19371)
* [loader] Add append option to loader hook installation functions
Fixes https://github.com/dotnet/runtime/issues/34273
While this specific issue only affects the preload hook, I've added the append option to all the installation functions since this seems like a generally useful capability, both for internal use and embedders.
@BrzVlad tested locally and confirmed this patch solves the problem.
* Update callers in pedump and monodis
Co-authored-by: CoffeeFlux <CoffeeFlux@users.noreply.github.com>
Co-authored-by: Ryan Lucia <rylucia@microsoft.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/pedump/pedump.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/pedump/pedump.c b/tools/pedump/pedump.c index f3cd18a684a..52d204719dd 100644 --- a/tools/pedump/pedump.c +++ b/tools/pedump/pedump.c @@ -467,23 +467,23 @@ verify_image_file (const char *fname) mono_assembly_fill_assembly_name (image, &assembly->aname); /*Finish initializing the runtime*/ - mono_install_assembly_load_hook_v2 (pedump_assembly_load_hook, NULL); - mono_install_assembly_search_hook_v2 (pedump_assembly_search_hook, NULL, FALSE, FALSE); + mono_install_assembly_load_hook_v2 (pedump_assembly_load_hook, NULL, FALSE); + mono_install_assembly_search_hook_v2 (pedump_assembly_search_hook, NULL, FALSE, FALSE, FALSE); mono_init_version ("pedump", image->version); - mono_install_assembly_preload_hook_v2 (pedump_preload, GUINT_TO_POINTER (FALSE), FALSE); + mono_install_assembly_preload_hook_v2 (pedump_preload, GUINT_TO_POINTER (FALSE), FALSE, FALSE); mono_icall_init (); mono_marshal_init (); } else { /*Finish initializing the runtime*/ - mono_install_assembly_load_hook_v2 (pedump_assembly_load_hook, NULL); - mono_install_assembly_search_hook_v2 (pedump_assembly_search_hook, NULL, FALSE, FALSE); + mono_install_assembly_load_hook_v2 (pedump_assembly_load_hook, NULL, FALSE); + mono_install_assembly_search_hook_v2 (pedump_assembly_search_hook, NULL, FALSE, FALSE, FALSE); mono_init_version ("pedump", NULL); - mono_install_assembly_preload_hook_v2 (pedump_preload, GUINT_TO_POINTER (FALSE), FALSE); + mono_install_assembly_preload_hook_v2 (pedump_preload, GUINT_TO_POINTER (FALSE), FALSE, FALSE); mono_icall_init (); mono_marshal_init (); |