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

8231124: Missing closedir call with JDK-8223490

Browse source 
Reviewed-by: naoto
This commit is contained in:
Sean Coffey 2019-09-17 16:39:56 +00:00
parent f88c32f6f6
commit b59950bc49
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/java.base/unix/native/libjava/TimeZone_md.c
View file

@ -130,11 +130,6 @@ findZoneinfoFile(char *buf, size_t size, const char *dir)
char *tz = NULL; char *tz = NULL;
int res; int res;
dirp = opendir(dir);
if (dirp == NULL) {
return NULL;
}
if (strcmp(dir, ZONEINFO_DIR) == 0) { if (strcmp(dir, ZONEINFO_DIR) == 0) {
/* fast path for 1st iteration */ /* fast path for 1st iteration */
for (unsigned int i = 0; i < sizeof (popularZones) / sizeof (popularZones[0]); i++) { for (unsigned int i = 0; i < sizeof (popularZones) / sizeof (popularZones[0]); i++) {
@ -151,6 +146,11 @@ findZoneinfoFile(char *buf, size_t size, const char *dir)
} }
} }
dirp = opendir(dir);
if (dirp == NULL) {
return NULL;
}
while ((dp = readdir(dirp)) != NULL) { while ((dp = readdir(dirp)) != NULL) {
/* /*
* Skip '.' and '..' (and possibly other .* files) * Skip '.' and '..' (and possibly other .* files)