Просмотр исходного кода

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

Haohui Mai 10 лет назад
Родитель
Сommit
edf2497df7

+ 3 - 0
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.

+ 1 - 1
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;

+ 2 - 2
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;