From e25fb1c8d2a8a5cdcdb4b14e5d0036bbe360e4e2 Mon Sep 17 00:00:00 2001
From: chegar <unknown>
Date: Sat, 22 Jun 2013 08:14:54 +0100
Subject: [PATCH] 8017271: Crash may occur in
 java.net.DualStackPlainSocketImpl::initIDs due to unchecked values returned
 from JNI functions Reviewed-by: alanb, khazra

---
 src/solaris/native/java/net/PlainDatagramSocketImpl.c  | 2 +-
 src/windows/native/java/net/DualStackPlainSocketImpl.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/solaris/native/java/net/PlainDatagramSocketImpl.c b/src/solaris/native/java/net/PlainDatagramSocketImpl.c
index 9ef598460..981bf534a 100644
--- a/src/solaris/native/java/net/PlainDatagramSocketImpl.c
+++ b/src/solaris/native/java/net/PlainDatagramSocketImpl.c
@@ -50,7 +50,7 @@
 #ifndef IP_MULTICAST_ALL
 #define IP_MULTICAST_ALL      49
 #endif
-#endif  //  __linux__`
+#endif  //  __linux__
 
 #ifndef IPTOS_TOS_MASK
 #define IPTOS_TOS_MASK 0x1e
diff --git a/src/windows/native/java/net/DualStackPlainSocketImpl.c b/src/windows/native/java/net/DualStackPlainSocketImpl.c
index 2c796edab..37bd53d76 100644
--- a/src/windows/native/java/net/DualStackPlainSocketImpl.c
+++ b/src/windows/native/java/net/DualStackPlainSocketImpl.c
@@ -43,6 +43,7 @@ JNIEXPORT void JNICALL Java_java_net_DualStackPlainSocketImpl_initIDs
   (JNIEnv *env, jclass clazz) {
 
     jclass cls = (*env)->FindClass(env, "java/net/InetSocketAddress");
+    CHECK_NULL(cls);
     isa_class = (*env)->NewGlobalRef(env, cls);
     isa_ctorID = (*env)->GetMethodID(env, cls, "<init>",
                                      "(Ljava/net/InetAddress;I)V");
-- 
GitLab