You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by wh...@apache.org on 2014/10/11 08:04:28 UTC

[2/2] git commit: HADOOP-11193. Fix uninitialized variables in NativeIO.c. Contributed by Xiaoyu Yao.

HADOOP-11193. Fix uninitialized variables in NativeIO.c. Contributed by Xiaoyu Yao.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/edf2497d
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/edf2497d
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/edf2497d

Branch: refs/heads/branch-2.6
Commit: edf2497df7ab02c835300b4b40ff120ffe225d77
Parents: 157f86f
Author: Haohui Mai <wh...@apache.org>
Authored: Fri Oct 10 23:02:22 2014 -0700
Committer: Haohui Mai <wh...@apache.org>
Committed: Fri Oct 10 23:04:19 2014 -0700

----------------------------------------------------------------------
 hadoop-common-project/hadoop-common/CHANGES.txt                  | 3 +++
 .../src/main/native/src/org/apache/hadoop/io/nativeio/NativeIO.c | 2 +-
 .../hadoop-common/src/main/winutils/libwinutils.c                | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/edf2497d/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 d516399..d08a86a 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -463,6 +463,9 @@ Release 2.6.0 - UNRELEASED
     HADOOP-11133. Should trim the content of keystore password file for JavaKeyStoreProvider
     (Yi Liu via umamahesh)
 
+    HADOOP-11193. Fix uninitialized variables in NativeIO.c
+    (Xiaoyu Yao via wheat9)
+
     BREAKDOWN OF HDFS-6134 AND HADOOP-10150 SUBTASKS AND RELATED JIRAS
   
       HADOOP-10734. Implement high-performance secure random number sources.

http://git-wip-us.apache.org/repos/asf/hadoop/blob/edf2497d/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/nativeio/NativeIO.c
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/nativeio/NativeIO.c b/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/nativeio/NativeIO.c
index d8538c8..b98aa0c 100644
--- a/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/nativeio/NativeIO.c
+++ b/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/nativeio/NativeIO.c
@@ -275,7 +275,7 @@ cleanup:
 #ifdef WINDOWS
   LPWSTR owner = NULL;
   LPWSTR group = NULL;
-  int mode;
+  int mode = 0;
   jstring jstr_owner = NULL;
   jstring jstr_group = NULL;
   int rc;

http://git-wip-us.apache.org/repos/asf/hadoop/blob/edf2497d/hadoop-common-project/hadoop-common/src/main/winutils/libwinutils.c
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/winutils/libwinutils.c b/hadoop-common-project/hadoop-common/src/main/winutils/libwinutils.c
index 391247f..4e4a7a7 100644
--- a/hadoop-common-project/hadoop-common/src/main/winutils/libwinutils.c
+++ b/hadoop-common-project/hadoop-common/src/main/winutils/libwinutils.c
@@ -806,8 +806,8 @@ DWORD FindFileOwnerAndPermission(
   DWORD cbSid = SECURITY_MAX_SID_SIZE;
   PACL pDacl = NULL;
 
-  BOOL isSymlink;
-  BY_HANDLE_FILE_INFORMATION fileInformation;
+  BOOL isSymlink = FALSE;
+  BY_HANDLE_FILE_INFORMATION fileInformation = {0};
 
   ACCESS_MASK ownerAccessRights = 0;
   ACCESS_MASK groupAccessRights = 0;