Fixed handling of -XX:+UseMallocHooks on Mac

schmelter-sap · Oct 1, 2023 · c4a95a9 · c4a95a9
1 parent 6552617
commit c4a95a9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/src/java.base/macosx/native/libjli/java_md_macosx.m b/src/java.base/macosx/native/libjli/java_md_macosx.m
@@ -398,14 +398,7 @@ static void MacOSXStartup(int argc, char *argv[]) {
         }
 
         if (putenv(env_entry) == 0) {
-            char** new_args = (char**) JLI_MemAlloc(sizeof(char*) * (*pargc));
-
-            for (int i = 1; i < *pargc; ++i) {
-                new_args[i - 1] = (*pargv)[i];
-            }
-
-            new_args[*pargc - 1] = NULL;
-            execve((*pargv)[0], new_args, environ);
+            execv(execname, argv);
         }
     }
 

diff --git a/src/java.base/share/native/libjli/java.c b/src/java.base/share/native/libjli/java.c
@@ -855,7 +855,7 @@ jboolean ShouldPreloadLibMallocHooks(int argc, char **argv) {
 #if defined(__APPLE__) || defined(LINUX)
     jboolean uses_new_trace = JNI_FALSE;
     jboolean uses_old_trace = JNI_FALSE;
-#if defined(APPLE)
+#if defined(__APPLE__)
     char const* env_name = "DYLD_INSERT_LIBRARIES";
     char const* libpath = "libmallochooks.dylib";
 #else