2 files changed, 6 insertions, 2 deletions
diff --git a/src/wrapped/wrappedlibc.c b/src/wrapped/wrappedlibc.c
index 61429120..a3828b96 100755
--- a/src/wrapped/wrappedlibc.c
+++ b/src/wrapped/wrappedlibc.c
@@ -1697,6 +1697,10 @@ EXPORT int32_t my_execve(x64emu_t* emu, const char* path, char* const argv[], ch
     int self = isProcSelf(path, "exe");
     int x64 = FileIsX64ELF(path);
     int x86 = my_context->box86path?FileIsX86ELF(path):0;
+    // hack to update the environ var if needed
+    if(envp == my_context->envv && environ) {
+        envp = environ;
+    }
     printf_log(LOG_DEBUG, "execve(\"%s\", %p, %p) is x64=%d x86=%d\n", path, argv, envp, x64, x86);
     #if 1
     if (x64 || x86 || self) {
diff --git a/src/wrapped/wrappedlibc_private.h b/src/wrapped/wrappedlibc_private.h
index bdcca88d..4618c139 100755
--- a/src/wrapped/wrappedlibc_private.h
+++ b/src/wrapped/wrappedlibc_private.h
@@ -250,8 +250,8 @@ GOW(endttyent, iFv)
 GO(endusershell, vFv)
 GOW(endutent, vFv)
 GO(endutxent, vFv)
-DATA(environ, sizeof(void*))
-DATAB(__environ, sizeof(void*))
+DATAM(environ, sizeof(void*))
+DATAM(__environ, sizeof(void*))
 GO(envz_add, iFpppp)
 GO(envz_entry, pFpLp)
 GO(envz_get, pFpLp)