stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8259577: Dangling reference to temp_path in Java_sun_tools_attach_VirtualMachineImpl_getTempDir

Browse Source 
Reviewed-by: cjplummer, lmesnik
This commit is contained in:
Kevin Walls 2021-03-08 11:40:15 +00:00
parent a0c3f24218
commit 51cca57c22
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/jdk.attach/macosx/native/libattach/VirtualMachineImpl.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -314,17 +314,14 @@ JNIEXPORT jstring JNICALL Java_sun_tools_attach_VirtualMachineImpl_getTempDir(JN
// directory not the java application's temp directory, ala java.io.tmpdir. // directory not the java application's temp directory, ala java.io.tmpdir.
#ifdef __APPLE__ #ifdef __APPLE__
// macosx has a secure per-user temporary directory // macosx has a secure per-user temporary directory.
static char *temp_path = NULL; // Don't cache the result as this is only called once.
char temp_path_storage[PATH_MAX]; char path[PATH_MAX];
if (temp_path == NULL) { int pathSize = confstr(_CS_DARWIN_USER_TEMP_DIR, path, PATH_MAX);
int pathSize = confstr(_CS_DARWIN_USER_TEMP_DIR, temp_path_storage, PATH_MAX); if (pathSize == 0 || pathSize > PATH_MAX) {
if (pathSize == 0 || pathSize > PATH_MAX) { strlcpy(path, "/tmp", sizeof(path));
strlcpy(temp_path_storage, "/tmp", sizeof(temp_path_storage));
}
temp_path = temp_path_storage;
} }
return JNU_NewStringPlatform(env, temp_path); return JNU_NewStringPlatform(env, path);
#else /* __APPLE__ */ #else /* __APPLE__ */
return (*env)->NewStringUTF(env, "/tmp"); return (*env)->NewStringUTF(env, "/tmp");
#endif /* __APPLE__ */ #endif /* __APPLE__ */