Merge pull request #1 from glcoder/master

ghorsington · web-flow · commit 06e979008730 · 2021-03-05T12:15:09.000+02:00
Fixed NPE in jit_init_hook
diff --git a/doorstop.c b/doorstop.c
@@ -91,7 +91,7 @@ void doorstop_init_mono_functions(void *handle)
 void *jit_init_hook(const char *root_domain_name, const char *runtime_version)
 {
     char *override = getenv("DOORSTOP_CORLIB_OVERRIDE_PATH");
-    DIR *override_dir = opendir(override);
+    DIR *override_dir = override ? opendir(override) : NULL;
     char *assembly_dir = r_mono_assembly_getrootdir();
     if (override && override_dir) {
         closedir(override_dir);

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ void doorstop_init_mono_functions(void *handle)`
`91`	`91`	`void jit_init_hook(const char root_domain_name, const char *runtime_version)`
`92`	`92`	`{`
`93`	`93`	`char *override = getenv("DOORSTOP_CORLIB_OVERRIDE_PATH");`
`94`		`- DIR *override_dir = opendir(override);`
	`94`	`+ DIR *override_dir = override ? opendir(override) : NULL;`
`95`	`95`	`char *assembly_dir = r_mono_assembly_getrootdir();`
`96`	`96`	`if (override && override_dir) {`
`97`	`97`	`closedir(override_dir);`