Merge pull request #4621 from alexanderkyte/strdup_env

[runtime] Switch getenv to use heap memory

diff --cc mono/metadata/appdomain.c
Simple merge

diff --cc mono/metadata/assembly.c
Simple merge

diff --cc mono/metadata/boehm-gc.c
Simple merge

diff --cc mono/metadata/class.c
Simple merge

diff --cc mono/metadata/cominterop.c
Simple merge

diff --cc mono/metadata/console-unix.c
Simple merge

diff --cc mono/metadata/icall.c
Simple merge

diff --cc mono/metadata/image.c
Simple merge

diff --cc mono/metadata/locales.c
Simple merge

diff --cc mono/metadata/lock-tracer.c
Simple merge

diff --cc mono/metadata/mono-config.c
index 413d7c40831df779ddf96fb371932d1f9f1dd9c3,8a65e0b8ece23931bf8ca9b36358d6de4299c54e..e598348f9ba23e0bdd12ccd7ae48bdd79cf8116b
--- 1/mono/metadata/mono-config.c
--- 2/mono/metadata/mono-config.c
+++ b/mono/metadata/mono-config.c
@@@ -686,15 -673,14 +686,17 @@@ mono_config_parse (const char *filename
  void
  mono_set_config_dir (const char *dir)
  {
-       /* If this variable is set, overrides the directory computed */
-       mono_cfg_dir = g_getenv ("MONO_CFG_DIR");
-       if (mono_cfg_dir == NULL)
-               mono_cfg_dir = mono_cfg_dir_allocated = g_strdup (dir);
+       /* If this environment variable is set, overrides the directory computed */
+       char *env_mono_cfg_dir = g_getenv ("MONO_CFG_DIR");
+       if (env_mono_cfg_dir == NULL && dir != NULL)
+               env_mono_cfg_dir = strdup (dir);
+ 
+       mono_cfg_dir = env_mono_cfg_dir;
  }
  
 +/**
 + * mono_get_config_dir:
 + */
  const char* 
  mono_get_config_dir (void)
  {

diff --cc mono/metadata/threadpool-io.c
Simple merge

diff --cc mono/metadata/w32file-unix.c
Simple merge

diff --cc mono/mini/aot-runtime.c
Simple merge

diff --cc mono/mini/debugger-agent.c
Simple merge

diff --cc mono/mini/driver.c
Simple merge

diff --cc mono/mini/helpers.c
Simple merge

diff --cc mono/mini/ir-emit.h
Simple merge

diff --cc mono/mini/liveness.c
Simple merge

diff --cc mono/mini/method-to-ir.c
Simple merge

diff --cc mono/mini/mini-arm.c
Simple merge

diff --cc mono/mini/mini-cross-helpers.c
Simple merge

diff --cc mono/mini/mini-gc.c
Simple merge

diff --cc mono/mini/mini-llvm.c
Simple merge

diff --cc mono/mini/mini-ppc.h
Simple merge

diff --cc mono/mini/mini-runtime.c
Simple merge

diff --cc mono/mini/mini-x86.c
Simple merge

diff --cc mono/mini/mini.c
Simple merge

diff --cc mono/sgen/sgen-gc.c
Simple merge

diff --cc mono/utils/checked-build.c
Simple merge

diff --cc mono/utils/mono-hwcap.c
Simple merge

diff --cc mono/utils/mono-io-portability.c
Simple merge

diff --cc mono/utils/mono-logger.c
Simple merge

diff --cc mono/utils/mono-mmap.c
Simple merge

diff --cc mono/utils/mono-rand.c
Simple merge

diff --cc mono/utils/mono-threads-coop.c
Simple merge

diff --cc mono/utils/mono-threads.c
Simple merge

diff --cc mono/utils/strenc.c
Simple merge