[2020-02] [mono][loader] Set status on success; avoid mmap on Android (#21610)

github-actions[bot] · lambdageek · web-flow · commit a102a350e538 · 2023-01-26T16:18:10.000+01:00
Manual backport of dotnet/runtime#80949 to mono/mono Emebedders that call `mono_assembly_load_from_full` may observe a non-NULL return value and an uninitialized MonoImageOpenStatus, which may lead to incorrect diagnostics in code like: ``` MonoImageOpenStatus status; MonoAssembly *assembly = mono_assembly_load_from_full (image, name, status, refonly); if (!assembly || status != MONO_IMAGE_OK) { fprintf(stderr, "Failure due to: %s\n", mono_image_strerror (status)); abort(); } ``` Which will print `Failure due to: Internal error` Avoid an mmap that will fail since Android uses a custom loader and the assemblies aren't on disk Co-authored-by: Aleksey Kliger <alklig@microsoft.com>
diff --git a/mono/metadata/assembly.c b/mono/metadata/assembly.c
@@ -3171,6 +3171,8 @@ mono_assembly_request_load_from (MonoImage *image, const char *fname,
 		mono_image_fixup_vtable (image);
 #endif
 
+	*status = MONO_IMAGE_OK;
+
 	mono_assembly_invoke_load_hook_internal (req->alc, ass);
 
 	MONO_PROFILER_RAISE (assembly_loaded, (ass));
diff --git a/mono/metadata/image.c b/mono/metadata/image.c
@@ -1067,7 +1067,7 @@ static void
 mono_image_load_time_date_stamp (MonoImage *image)
 {
 	image->time_date_stamp = 0;
-#ifndef HOST_WIN32
+#if !defined (HOST_WIN32) && !defined (HOST_ANDROID)
 	if (!image->filename)
 		return;
 

Original file line number	Diff line number	Diff line change
`@@ -1067,7 +1067,7 @@ static void`
`1067`	`1067`	`mono_image_load_time_date_stamp (MonoImage *image)`
`1068`	`1068`	`{`
`1069`	`1069`	`image->time_date_stamp = 0;`
`1070`		`-#ifndef HOST_WIN32`
	`1070`	`+#if !defined (HOST_WIN32) && !defined (HOST_ANDROID)`
`1071`	`1071`	`if (!image->filename)`
`1072`	`1072`	`return;`
`1073`	`1073`