Merge "fix warning: Function call argument is an uninitialized value"

am: 29d750d Change-Id: Icdfb79e773e380fed625186dc0036cce6bbf1809
DC-fgervais · Dec 1, 2016 · 8a72f61 · 8a72f61
2 parents 4bc2288 + 29d750d
commit 8a72f61
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/ojluni/src/main/native/PlainDatagramSocketImpl.c b/ojluni/src/main/native/PlainDatagramSocketImpl.c
@@ -500,6 +500,7 @@ PlainDatagramSocketImpl_peek(JNIEnv *env, jobject this,
     }
     if (IS_NULL(addressObj)) {
         JNU_ThrowNullPointerException(env, "Null address in peek()");
+        return -1;
     }
     if (timeout) {
         int ret = NET_Timeout(fd, timeout);
@@ -1386,7 +1387,7 @@ PlainDatagramSocketImpl_socketSetOption0(JNIEnv *env,
         default :
             JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException",
                 "Socket option not supported by PlainDatagramSocketImp");
-            break;
+            return;
 
     }
 
@@ -1608,6 +1609,9 @@ PlainDatagramSocketImpl_setTimeToLive(JNIEnv *env, jobject this,
 #ifdef AF_INET6
 #ifdef __linux__
     setTTL(env, fd, ttl);
+    if ((*env)->ExceptionCheck(env)) {
+        return;
+    }
     if (ipv6_available()) {
         setHopLimit(env, fd, ttl);
     }
@@ -1830,6 +1834,7 @@ static void mcast_join_leave(JNIEnv *env, jobject this,
                     else
                         NET_ThrowCurrent(env, "setsockopt IP_DROP_MEMBERSHIP failed");
                 }
+                return;
             }
         }