archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 07:14:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8207060: Memory leak when malloc fails within WITH_UNICODE_STRING block

Browse source 
Reviewed-by: vtewari, rriggs
This commit is contained in:
Ivan Gerasimov 2018-07-12 11:18:01 -07:00
parent 78f3c8a7d4
commit 051dfe9fb4
1 changed files with 1 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/java.base/windows/native/libjava/io_util_md.c
View file

@ -165,9 +165,6 @@ pathToNTPath(JNIEnv *env, jstring path, jboolean throwFNFE) {
pathbuf = (WCHAR*)malloc((pathlen + 6) * sizeof(WCHAR));
if (pathbuf != 0) {
wcscpy(pathbuf, ps);
} else {
JNU_ThrowOutOfMemoryError(env, "native memory allocation failed");
return NULL;
}
}
} else {
@ -191,9 +188,6 @@ pathToNTPath(JNIEnv *env, jstring path, jboolean throwFNFE) {
pathbuf = (WCHAR*)malloc((pathlen + 6) * sizeof(WCHAR));
if (pathbuf != 0) {
wcscpy(pathbuf, ps);
} else {
JNU_ThrowOutOfMemoryError(env, "native memory allocation failed");
return NULL;
}
}
}
@ -210,15 +204,11 @@ pathToNTPath(JNIEnv *env, jstring path, jboolean throwFNFE) {
pathbuf = (WCHAR*)malloc(sizeof(WCHAR));
if (pathbuf != NULL) {
pathbuf[0] = L'\0';
} else {
JNU_ThrowOutOfMemoryError(env, 0);
return NULL;
}
}
}
if (pathbuf == 0) {
JNU_ThrowOutOfMemoryError(env, 0);
return NULL;
JNU_ThrowOutOfMemoryError(env, "native memory allocation failed");
}
return pathbuf;
}