changeset 9341:8e5e92e0530e

8035653: InetAddress.getLocalHost crash Reviewed-by: chegar
author michaelm
date Wed, 26 Feb 2014 16:18:08 +0000
parents 9c856b67448d
children c690bc5cf133
files src/windows/classes/java/net/DualStackPlainDatagramSocketImpl.java src/windows/native/java/net/DualStackPlainDatagramSocketImpl.c test/java/net/DatagramSocket/B8035653.java
diffstat 3 files changed, 57 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/windows/classes/java/net/DualStackPlainDatagramSocketImpl.java	Fri Feb 21 17:12:23 2014 +0400
+++ b/src/windows/classes/java/net/DualStackPlainDatagramSocketImpl.java	Wed Feb 26 16:18:08 2014 +0000
@@ -45,6 +45,10 @@
 {
     static JavaIOFileDescriptorAccess fdAccess = SharedSecrets.getJavaIOFileDescriptorAccess();
 
+    static {
+        initIDs();
+    }
+
     // true if this socket is exclusively bound
     private final boolean exclusiveBind;
 
--- a/src/windows/native/java/net/DualStackPlainDatagramSocketImpl.c	Fri Feb 21 17:12:23 2014 +0400
+++ b/src/windows/native/java/net/DualStackPlainDatagramSocketImpl.c	Wed Feb 26 16:18:08 2014 +0000
@@ -72,6 +72,17 @@
 
 /*
  * Class:     java_net_DualStackPlainDatagramSocketImpl
+ * Method:    initIDs
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_java_net_DualStackPlainDatagramSocketImpl_initIDs
+  (JNIEnv *env, jclass clazz)
+{
+    initInetAddressIDs(env);
+}
+
+/*
+ * Class:     java_net_DualStackPlainDatagramSocketImpl
  * Method:    socketCreate
  * Signature: (Z)I
  */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/java/net/DatagramSocket/B8035653.java	Wed Feb 26 16:18:08 2014 +0000
@@ -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();
+        }
+   }
+}