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

8209994: windows: Java_java_net_NetworkInterface_getAll misses releasing interface-list

Browse Source 
Reviewed-by: bpb, chegar, simonis
This commit is contained in:
Matthias Baesken 2018-08-28 09:01:54 +02:00
parent 232804b8ab
commit 3f4b55c4df
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/java.base/windows/native/libnet/NetworkInterface.c
View File

@ -826,7 +826,7 @@ JNIEXPORT jobjectArray JNICALL Java_java_net_NetworkInterface_getAll
(JNIEnv *env, jclass cls)
{
int count;
netif *ifList, *curr;
netif *ifList = NULL, *curr;
jobjectArray netIFArr;
jint arr_index;
@ -846,6 +846,7 @@ JNIEXPORT jobjectArray JNICALL Java_java_net_NetworkInterface_getAll
/* allocate a NetworkInterface array */
netIFArr = (*env)->NewObjectArray(env, count, cls, NULL);
if (netIFArr == NULL) {
free_netif(ifList);
return NULL;
}
@ -860,6 +861,7 @@ JNIEXPORT jobjectArray JNICALL Java_java_net_NetworkInterface_getAll
netifObj = createNetworkInterface(env, curr, -1, NULL);
if (netifObj == NULL) {
free_netif(ifList);
return NULL;
}

4
src/java.base/windows/native/libnet/NetworkInterface_winXP.c
View File

@ -784,7 +784,7 @@ JNIEXPORT jobjectArray JNICALL Java_java_net_NetworkInterface_getAll_XP
(JNIEnv *env, jclass cls)
{
int count;
netif *ifList, *curr;
netif *ifList = NULL, *curr;
jobjectArray netIFArr;
jint arr_index;
@ -799,6 +799,7 @@ JNIEXPORT jobjectArray JNICALL Java_java_net_NetworkInterface_getAll_XP
/* allocate a NetworkInterface array */
netIFArr = (*env)->NewObjectArray(env, count, cls, NULL);
if (netIFArr == NULL) {
free_netif(ifList);
return NULL;
}
@ -813,6 +814,7 @@ JNIEXPORT jobjectArray JNICALL Java_java_net_NetworkInterface_getAll_XP
netifObj = createNetworkInterfaceXP(env, curr);
if (netifObj == NULL) {
free_netif(ifList);
return NULL;
}