changeset 12422:f08a4bccd723

8035653: InetAddress.getLocalHost crash Reviewed-by: chegar
author michaelm
date Thu, 27 Apr 2017 23:06:51 +0200
parents b77bc7c2e9ed
children 13b1fdf3ba75
files src/windows/native/java/net/DualStackPlainDatagramSocketImpl.c test/java/net/DatagramSocket/B8035653.java
diffstat 2 files changed, 44 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/windows/native/java/net/DualStackPlainDatagramSocketImpl.c	Fri Apr 14 18:01:18 2017 +0300
+++ b/src/windows/native/java/net/DualStackPlainDatagramSocketImpl.c	Thu Apr 27 23:06:51 2017 +0200
@@ -87,6 +87,8 @@
     IO_fd_fdID = NET_GetFileDescriptorID(env);
     CHECK_NULL(IO_fd_fdID);
     JNU_CHECK_EXCEPTION(env);
+
+    initInetAddressIDs(env);
 }
 
 /*
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/java/net/DatagramSocket/B8035653.java	Thu Apr 27 23:06:51 2017 +0200
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8035653
+ * @run main/othervm -Xcheck:jni B8035653
+ * @summary InetAddress.getLocalHost crash
+ */
+
+import java.net.*;
+import java.util.*;
+
+public class B8035653 {
+   public static void main(String[] args) throws Exception {
+      try (DatagramSocket ds = new DatagramSocket();){
+            ds.getLocalAddress();
+        } catch (SocketException e) {
+            e.printStackTrace();
+        }
+   }
+}