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

8294115: JNI local refs exceeds capacity warning in NetworkInterface::getAll

Browse Source 
Reviewed-by: dfuchs
This commit is contained in:
Daniel Jeliński 2022-09-30 06:00:37 +00:00
parent b030c7de32
commit 9dce8652f2
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2003, 2022, 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
@ -576,7 +576,9 @@ static jobject createNetworkInterfaceXP(JNIEnv *env, netif *ifs)
return NULL; return NULL;
} }
(*env)->SetObjectField(env, netifObj, ni_nameID, name); (*env)->SetObjectField(env, netifObj, ni_nameID, name);
(*env)->DeleteLocalRef(env, name);
(*env)->SetObjectField(env, netifObj, ni_displayNameID, displayName); (*env)->SetObjectField(env, netifObj, ni_displayNameID, displayName);
(*env)->DeleteLocalRef(env, displayName);
(*env)->SetIntField(env, netifObj, ni_indexID, ifs->index); (*env)->SetIntField(env, netifObj, ni_indexID, ifs->index);
/* /*
* Get the IP addresses for this interface if necessary * Get the IP addresses for this interface if necessary
@ -646,8 +648,10 @@ static jobject createNetworkInterfaceXP(JNIEnv *env, netif *ifs)
return NULL; return NULL;
} }
(*env)->SetObjectField(env, ibObj, ni_ibbroadcastID, ia2Obj); (*env)->SetObjectField(env, ibObj, ni_ibbroadcastID, ia2Obj);
(*env)->DeleteLocalRef(env, ia2Obj);
(*env)->SetShortField(env, ibObj, ni_ibmaskID, addrs->mask); (*env)->SetShortField(env, ibObj, ni_ibmaskID, addrs->mask);
(*env)->SetObjectArrayElement(env, bindsArr, bind_index++, ibObj); (*env)->SetObjectArrayElement(env, bindsArr, bind_index++, ibObj);
(*env)->DeleteLocalRef(env, ibObj);
} else /* AF_INET6 */ { } else /* AF_INET6 */ {
int scope; int scope;
jboolean ret; jboolean ret;
@ -674,13 +678,17 @@ static jobject createNetworkInterfaceXP(JNIEnv *env, netif *ifs)
(*env)->SetObjectField(env, ibObj, ni_ibaddressID, iaObj); (*env)->SetObjectField(env, ibObj, ni_ibaddressID, iaObj);
(*env)->SetShortField(env, ibObj, ni_ibmaskID, addrs->mask); (*env)->SetShortField(env, ibObj, ni_ibmaskID, addrs->mask);
(*env)->SetObjectArrayElement(env, bindsArr, bind_index++, ibObj); (*env)->SetObjectArrayElement(env, bindsArr, bind_index++, ibObj);
(*env)->DeleteLocalRef(env, ibObj);
} }
(*env)->SetObjectArrayElement(env, addrArr, addr_index, iaObj); (*env)->SetObjectArrayElement(env, addrArr, addr_index, iaObj);
(*env)->DeleteLocalRef(env, iaObj);
addrs = addrs->next; addrs = addrs->next;
addr_index++; addr_index++;
} }
(*env)->SetObjectField(env, netifObj, ni_addrsID, addrArr); (*env)->SetObjectField(env, netifObj, ni_addrsID, addrArr);
(*env)->DeleteLocalRef(env, addrArr);
(*env)->SetObjectField(env, netifObj, ni_bindsID, bindsArr); (*env)->SetObjectField(env, netifObj, ni_bindsID, bindsArr);
(*env)->DeleteLocalRef(env, bindsArr);
free_netaddr(netaddrPToFree); free_netaddr(netaddrPToFree);
@ -693,6 +701,7 @@ static jobject createNetworkInterfaceXP(JNIEnv *env, netif *ifs)
return NULL; return NULL;
} }
(*env)->SetObjectField(env, netifObj, ni_childsID, childArr); (*env)->SetObjectField(env, netifObj, ni_childsID, childArr);
(*env)->DeleteLocalRef(env, childArr);
/* return the NetworkInterface */ /* return the NetworkInterface */
return netifObj; return netifObj;
@ -871,6 +880,7 @@ JNIEXPORT jobjectArray JNICALL Java_java_net_NetworkInterface_getAll_XP
/* put the NetworkInterface into the array */ /* put the NetworkInterface into the array */
(*env)->SetObjectArrayElement(env, netIFArr, arr_index++, netifObj); (*env)->SetObjectArrayElement(env, netIFArr, arr_index++, netifObj);
(*env)->DeleteLocalRef(env, netifObj);
curr = curr->next; curr = curr->next;
} }