# HG changeset patch # User clanger # Date 1523863210 -19800 # Node ID a838e3707f3a94b9994ef58e1f74c28d6dc62711 # Parent a3e79f97e86bbe5c14a5a62a7db228aefc62a323 8201369: Inet4AddressImpl_getLocalHostName reverse lookup on Solaris only Reviewed-by: clanger, chegar Contributed-by: sshamaia@in.ibm.com diff -r a3e79f97e86b -r a838e3707f3a src/java.base/unix/native/libnet/Inet4AddressImpl.c --- a/src/java.base/unix/native/libnet/Inet4AddressImpl.c Wed Apr 18 10:39:40 2018 -0400 +++ b/src/java.base/unix/native/libnet/Inet4AddressImpl.c Mon Apr 16 12:50:10 2018 +0530 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2018, 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 @@ -68,6 +68,7 @@ hostname[0] = '\0'; if (gethostname(hostname, NI_MAXHOST) != 0) { strcpy(hostname, "localhost"); +#if defined(__solaris__) } else { // try to resolve hostname via nameservice // if it is known but getnameinfo fails, hostname will still be the @@ -86,6 +87,12 @@ freeaddrinfo(res); } } +#else + } else { + // make sure string is null-terminated + hostname[NI_MAXHOST] = '\0'; + } +#endif return (*env)->NewStringUTF(env, hostname); }