diff options
| -rw-r--r-- | luni/src/test/java/libcore/java/net/NetworkInterfaceTest.java | 26 | ||||
| -rw-r--r-- | ojluni/src/main/java/java/net/NetworkInterface.java | 7 | ||||
| -rw-r--r-- | ojluni/src/main/native/zip_util.c | 2 |
3 files changed, 32 insertions, 3 deletions
diff --git a/luni/src/test/java/libcore/java/net/NetworkInterfaceTest.java b/luni/src/test/java/libcore/java/net/NetworkInterfaceTest.java index f0f79ade93..8375421c6b 100644 --- a/luni/src/test/java/libcore/java/net/NetworkInterfaceTest.java +++ b/luni/src/test/java/libcore/java/net/NetworkInterfaceTest.java @@ -17,6 +17,7 @@ package libcore.java.net; import junit.framework.TestCase; +import org.mockito.Mockito; import android.system.StructIfaddrs; import java.io.BufferedReader; @@ -39,6 +40,7 @@ import java.util.Set; import java.util.regex.Pattern; import libcore.io.IoUtils; import libcore.io.Libcore; +import libcore.io.Os; import static android.system.OsConstants.AF_INET; import static android.system.OsConstants.IFF_LOOPBACK; @@ -48,6 +50,7 @@ import static android.system.OsConstants.IFF_RUNNING; import static android.system.OsConstants.IFF_UP; import static android.system.OsConstants.SOCK_DGRAM; import static java.net.NetworkInterface.getNetworkInterfaces; +import static org.mockito.ArgumentMatchers.anyString; public class NetworkInterfaceTest extends TestCase { // http://code.google.com/p/android/issues/detail?id=13784 @@ -221,6 +224,29 @@ public class NetworkInterfaceTest extends TestCase { assertEquals(ifaddrsNames, actualNiNames); } + // Validate that we don't fail to enumerate interfaces if there is virtual interface without parent interface present. + // b/159277702 + public void testGetNetworkInterfaces_OrphanInterfaceDoesNotThrow() throws Exception { + Os originalOs = Libcore.getOs(); + Os mockOs = Mockito.mock(Os.class); + + try { + Mockito.when(mockOs.getifaddrs()).thenReturn(new StructIfaddrs[] { + new StructIfaddrs("dummy0:1", 0, null, null, null, null), + }); + + Mockito.when(mockOs.if_nametoindex(anyString())).thenReturn(1); + + assertTrue("Failed to swap OS implementation", Libcore.compareAndSetOs(originalOs, mockOs)); + + Enumeration<NetworkInterface> interfaces = NetworkInterface.getNetworkInterfaces(); + assertEquals(1, Collections.list(interfaces).size()); + } + finally { + assertTrue("Failed to revert OS implementation", Libcore.compareAndSetOs(mockOs, originalOs)); + } + } + // Calling getSubInterfaces on interfaces with no subinterface should not throw NPE. // http://b/33844501 public void testGetSubInterfaces() throws Exception { diff --git a/ojluni/src/main/java/java/net/NetworkInterface.java b/ojluni/src/main/java/java/net/NetworkInterface.java index a30b6bf2cf..e56e0cb62a 100644 --- a/ojluni/src/main/java/java/net/NetworkInterface.java +++ b/ojluni/src/main/java/java/net/NetworkInterface.java @@ -494,8 +494,11 @@ public final class NetworkInterface { NetworkInterface parent = nis.get(parentName); ni.virtual = true; - ni.parent = parent; - parent.childs.add(ni); + + if (parent != null) { + ni.parent = parent; + parent.childs.add(ni); + } } } diff --git a/ojluni/src/main/native/zip_util.c b/ojluni/src/main/native/zip_util.c index 6c02d2bc73..aa9c5cede9 100644 --- a/ojluni/src/main/native/zip_util.c +++ b/ojluni/src/main/native/zip_util.c @@ -156,7 +156,7 @@ ZFILE_read(ZFILE zfd, char *buf, jint nbytes, jlong offset) { * JVM_IO_INTR is tricky and could cause undesired side effect. So we decided * to simply call "read" on Solaris/Linux. See details in bug 6304463. */ - return pread(zfd, buf, nbytes, offset); + return pread64(zfd, buf, nbytes, offset); #endif } |