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

8211149: fix potential memleak in getJavaIDFromLangID after failing SetupI18nProps call [windows]

Browse source 
Reviewed-by: naoto, lucy
This commit is contained in:
Matthias Baesken 2018-09-27 15:37:55 +02:00
parent 36f62aa6c0
commit f8d007dbf0
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/java.base/windows/native/libjava/java_props_md.c
View file

@ -170,6 +170,10 @@ getJavaIDFromLangID(LANGID langID)
return NULL;
}
for (index = 0; index < 5; index++) {
elems[index] = NULL;
}
if (SetupI18nProps(MAKELCID(langID, SORT_DEFAULT),
&(elems[0]), &(elems[1]), &(elems[2]), &(elems[3]), &(elems[4]))) {
@ -183,15 +187,17 @@ getJavaIDFromLangID(LANGID langID)
strcat(ret, elems[index]);
}
}
for (index = 0; index < 5; index++) {
free(elems[index]);
}
} else {
free(ret);
ret = NULL;
}
for (index = 0; index < 5; index++) {
if (elems[index] != NULL) {
free(elems[index]);
}
}
return ret;
}