提交 6173b98f 编写于 作者: C chegar

8058216: NetworkInterface.getHardwareAddress can return zero length byte array...

8058216: NetworkInterface.getHardwareAddress can return zero length byte array when run with preferIPv4Stack
Reviewed-by: michaelm
上级 65414e1f
...@@ -1014,10 +1014,12 @@ JNIEXPORT jbyteArray JNICALL Java_java_net_NetworkInterface_getMacAddr0 ...@@ -1014,10 +1014,12 @@ JNIEXPORT jbyteArray JNICALL Java_java_net_NetworkInterface_getMacAddr0
case MIB_IF_TYPE_FDDI: case MIB_IF_TYPE_FDDI:
case IF_TYPE_IEEE80211: case IF_TYPE_IEEE80211:
len = ifRowP->dwPhysAddrLen; len = ifRowP->dwPhysAddrLen;
if (len > 0) {
ret = (*env)->NewByteArray(env, len); ret = (*env)->NewByteArray(env, len);
if (!IS_NULL(ret)) { if (!IS_NULL(ret)) {
(*env)->SetByteArrayRegion(env, ret, 0, len, (jbyte *) ifRowP->bPhysAddr); (*env)->SetByteArrayRegion(env, ret, 0, len, (jbyte *) ifRowP->bPhysAddr);
} }
}
break; break;
} }
free(ifRowP); free(ifRowP);
......
...@@ -22,7 +22,9 @@ ...@@ -22,7 +22,9 @@
*/ */
/* @test /* @test
* @bug 4405354 6594296 * @bug 4405354 6594296 8058216
* @run main Test
* @run main/othervm -Djava.net.preferIPv4Stack=true Test
* @summary Basic tests for NetworkInterface * @summary Basic tests for NetworkInterface
*/ */
import java.net.NetworkInterface; import java.net.NetworkInterface;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册