Make sure to use custom allocator for everything Env related

2 files changed, 5 insertions, 4 deletions

diff --git a/src/core.c b/src/core.c
index 5224e086..b7636207 100644
--- a/src/core.c
+++ b/src/core.c
@@ -736,14 +736,14 @@ int initialize(int argc, const char **argv, char** env, x64emu_t** emulator, elf
 
     ftrace = stdout;
 
-    LoadEnvVariables();
-    InitializeEnvFiles();
-
     // grab pagesize
     box64_pagesize = sysconf(_SC_PAGESIZE);
     if(!box64_pagesize)
         box64_pagesize = 4096;
 
+    LoadEnvVariables();
+    InitializeEnvFiles();
+
     const char* prog = argv[1];
     int nextarg = 1;
     // check if some options are passed
diff --git a/src/tools/env.c b/src/tools/env.c
index 25134089..c86a143c 100644
--- a/src/tools/env.c
+++ b/src/tools/env.c
@@ -12,6 +12,7 @@
 
 #include "os.h"
 #include "env.h"
+#include "custommem.h"
 #include "khash.h"
 #include "debug.h"
 #include "fileutils.h"
@@ -294,7 +295,7 @@ static void pushNewEntry(const char* name, box64env_t* env, int gen)
     k = kh_get(box64env_entry, khp, name);
     if (k == kh_end(khp)) {
         int ret;
-        k = kh_put(box64env_entry, khp, strdup(name), &ret);
+        k = kh_put(box64env_entry, khp, box_strdup(name), &ret);
     } else {
         freeEnv(&kh_value(khp, k));
     }