Repository: hadoop Updated Branches: refs/heads/branch-2 71c9f2f4e -> 72b706a1b
HADOOP-11848. Incorrect arguments to sizeof in DomainSocket.c (Malcolm Kavalsky via Colin P. McCabe) (cherry picked from commit a3b1d8c90288a6237089a98d4a81c25f44aedb2c) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/72b706a1 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/72b706a1 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/72b706a1 Branch: refs/heads/branch-2 Commit: 72b706a1b0ea789f87dc7b4247856f0ad5915561 Parents: 71c9f2f Author: Colin Patrick Mccabe <[email protected]> Authored: Wed Apr 22 12:41:07 2015 -0700 Committer: Colin Patrick Mccabe <[email protected]> Committed: Wed Apr 22 12:41:07 2015 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../src/main/native/src/org/apache/hadoop/net/unix/DomainSocket.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/72b706a1/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 8bcc3eb..5c398d0 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -95,6 +95,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 http://git-wip-us.apache.org/repos/asf/hadoop/blob/72b706a1/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/net/unix/DomainSocket.c ---------------------------------------------------------------------- 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 48c4252..55ab0c3 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) {
