src/solaris/native/java/net/net_util_md.c

rev 12042 : 8169865: Downport minor fixes in java.net native code from JDK 9 to JDK 8

*** 331,340 ****
--- 331,341 ----
       * IPv4 socket then we need to disable IPv6.
       */
      if (getsockname(0, (struct sockaddr *)&sa, &sa_len) == 0) {
          struct sockaddr *saP = (struct sockaddr *)&sa;
          if (saP->sa_family != AF_INET6) {
+             close(fd);
              return JNI_FALSE;
          }
      }
  
      /**
*** 1205,1224 ****
  int
  NET_GetSockOpt(int fd, int level, int opt, void *result,
                 int *len)
  {
      int rv;
  
! #ifdef __solaris__
!     rv = getsockopt(fd, level, opt, result, len);
! #else
!     {
!         socklen_t socklen = *len;
!         rv = getsockopt(fd, level, opt, result, &socklen);
!         *len = socklen;
!     }
! #endif
  
      if (rv < 0) {
          return rv;
      }
  
--- 1206,1219 ----
  int
  NET_GetSockOpt(int fd, int level, int opt, void *result,
                 int *len)
  {
      int rv;
+     socklen_t socklen = *len;
  
!     rv = getsockopt(fd, level, opt, result, &socklen);
!     *len = socklen;
  
      if (rv < 0) {
          return rv;
      }