From a3b1d8c90288a6237089a98d4a81c25f44aedb2c Mon Sep 17 00:00:00 2001 From: Colin Patrick Mccabe Date: Wed, 22 Apr 2015 11:27:38 -0700 Subject: [PATCH] HADOOP-11848. Incorrect arguments to sizeof in DomainSocket.c (Malcolm Kavalsky via Colin P. McCabe) --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../main/native/src/org/apache/hadoop/net/unix/DomainSocket.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 0ba1cdd402..1234ea08a5 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -536,6 +536,9 @@ Release 2.8.0 - UNRELEASED HADOOP-11859. PseudoAuthenticationHandler fails with httpcomponents v4.4. (Eugene Koifman via jitendra) + HADOOP-11848. Incorrect arguments to sizeof in DomainSocket.c (Malcolm + Kavalsky via Colin P. McCabe) + Release 2.7.1 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/net/unix/DomainSocket.c b/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/net/unix/DomainSocket.c index 48c4252fe7..55ab0c3e4c 100644 --- a/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/net/unix/DomainSocket.c +++ b/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/net/unix/DomainSocket.c @@ -153,7 +153,7 @@ static jthrowable setup(JNIEnv *env, int *ofd, jobject jpath, int doConnect) terror(ret)); goto done; } - memset(&addr, 0, sizeof(&addr)); + memset(&addr, 0, sizeof(addr)); addr.sun_family = AF_UNIX; cpath = (*env)->GetStringUTFChars(env, jpath, NULL); if (!cpath) {