infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-06-08 03:25:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

7114558: Inet4AddressImpl should use memset (rather than bzero) and NI_MAXHOST (rather than MAXHOSTNAMELEN)

Browse Source 
Reviewed-by: chegar
This commit is contained in:
Neil Richards 2011-11-22 09:51:30 +00:00 committed by Neil Richards
parent 5f797b5bda
commit a3e56c5b67
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
jdk/src/solaris/native/java/net/Inet4AddressImpl.c
View File

@ -65,11 +65,11 @@ Java_java_net_Inet4AddressImpl_getLocalHostName(JNIEnv *env, jobject this) {
/* Something went wrong, maybe networking is not setup? */
strcpy(hostname, "localhost");
} else {
hostname[NI_MAXHOST] = '\0';
struct addrinfo hints, *res;
struct addrinfo hints, *res;
int error;
bzero(&hints, sizeof(hints));
hostname[NI_MAXHOST] = '\0';
memset(&hints, 0, sizeof(hints));
hints.ai_flags = AI_CANONNAME;
hints.ai_family = AF_INET;
@ -79,7 +79,7 @@ Java_java_net_Inet4AddressImpl_getLocalHostName(JNIEnv *env, jobject this) {
getnameinfo(res->ai_addr,
res->ai_addrlen,
hostname,
MAXHOSTNAMELEN,
NI_MAXHOST,
NULL,
0,
NI_NAMEREQD);
@ -141,7 +141,7 @@ Java_java_net_Inet4AddressImpl_lookupAllHostAddr(JNIEnv *env, jobject this,
CHECK_NULL_RETURN(hostname, NULL);
/* Try once, with our static buffer. */
bzero(&hints, sizeof(hints));
memset(&hints, 0, sizeof(hints));
hints.ai_flags = AI_CANONNAME;
hints.ai_family = AF_INET;
@ -261,10 +261,9 @@ Java_java_net_Inet4AddressImpl_getHostByAddr(JNIEnv *env, jobject this,
char host[NI_MAXHOST+1];
int error = 0;
int len = 0;
jbyte caddr[16];
jbyte caddr[4];
struct sockaddr_in him4;
struct sockaddr_in6 him6;
struct sockaddr *sa;
jint addr;

4
jdk/src/solaris/native/java/net/Inet6AddressImpl.c
View File

@ -85,7 +85,7 @@ Java_java_net_Inet6AddressImpl_getLocalHostName(JNIEnv *env, jobject this) {
struct addrinfo hints, *res;
int error;
bzero(&hints, sizeof(hints));
memset(&hints, 0, sizeof(hints));
hints.ai_flags = AI_CANONNAME;
hints.ai_family = AF_UNSPEC;
@ -188,7 +188,7 @@ Java_java_net_Inet6AddressImpl_lookupAllHostAddr(JNIEnv *env, jobject this,
= (*env)->GetStaticBooleanField(env, ia_class, ia_preferIPv6AddressID);
/* Try once, with our static buffer. */
bzero(&hints, sizeof(hints));
memset(&hints, 0, sizeof(hints));
hints.ai_flags = AI_CANONNAME;
hints.ai_family = AF_UNSPEC;