From 0485f7990364e4d7a9e1294fa6abf46119bf6e2f Mon Sep 17 00:00:00 2001
From: fengjq <fengjunqing@huawei.com>
Date: Thu, 15 Jun 2023 11:28:28 +0800
Subject: [PATCH] Fix the issue of mixing signed and unsigned numbers

Signed-off-by: fengjq <fengjunqing@huawei.com>
---
 interfaces/kits/js/src/mod_fileio/common_func.cpp      |  2 +-
 interfaces/kits/js/src/mod_fileio/common_func.h        |  2 +-
 .../mod_fileio/properties/create_randomaccessfile.cpp  | 10 +++++-----
 .../kits/js/src/mod_fileio/properties/open_v9.cpp      |  8 ++++----
 interfaces/kits/js/src/mod_fs/properties/open.cpp      |  6 +++---
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/interfaces/kits/js/src/mod_fileio/common_func.cpp b/interfaces/kits/js/src/mod_fileio/common_func.cpp
index 0ec589448..7e192446a 100644
--- a/interfaces/kits/js/src/mod_fileio/common_func.cpp
+++ b/interfaces/kits/js/src/mod_fileio/common_func.cpp
@@ -132,7 +132,7 @@ static tuple<bool, size_t> GetActualLenV9(napi_env env, int64_t bufLen, int64_t
     return { true, retLen };
 }
 
-int CommonFunc::ConvertJsFlags(int &flags)
+unsigned int CommonFunc::ConvertJsFlags(unsigned int &flags)
 {
     static constexpr unsigned int usrReadOnly = 00;
     static constexpr unsigned int usrWriteOnly = 01;
diff --git a/interfaces/kits/js/src/mod_fileio/common_func.h b/interfaces/kits/js/src/mod_fileio/common_func.h
index 2ef467d28..5ee78586d 100644
--- a/interfaces/kits/js/src/mod_fileio/common_func.h
+++ b/interfaces/kits/js/src/mod_fileio/common_func.h
@@ -36,7 +36,7 @@ constexpr int SYNC = 04010000;
 void InitOpenMode(napi_env env, napi_value exports);
 
 struct CommonFunc {
-    static int ConvertJsFlags(int &flags);
+    static unsigned int ConvertJsFlags(unsigned int &flags);
     static std::tuple<bool, void *, int64_t, bool, int64_t, int> GetReadArg(napi_env env,
                                                                             napi_value readBuf,
                                                                             napi_value option);
diff --git a/interfaces/kits/js/src/mod_fileio/properties/create_randomaccessfile.cpp b/interfaces/kits/js/src/mod_fileio/properties/create_randomaccessfile.cpp
index 461390164..81f030279 100644
--- a/interfaces/kits/js/src/mod_fileio/properties/create_randomaccessfile.cpp
+++ b/interfaces/kits/js/src/mod_fileio/properties/create_randomaccessfile.cpp
@@ -85,17 +85,17 @@ static tuple<bool, FileInfo, size_t> ParseJsFileAndFP(napi_env env, napi_value p
     return { false, FileInfo { false, {}, {} }, -1 };
 };
 
-static tuple<bool, int> GetJsFlags(napi_env env, const NFuncArg &funcArg, FileInfo &fileInfo)
+static tuple<bool, unsigned int> GetJsFlags(napi_env env, const NFuncArg &funcArg, FileInfo &fileInfo)
 {
-    int flags = O_RDONLY;
-    bool succ = false;
+    unsigned int flags = O_RDONLY;
     if (fileInfo.isPath) {
         if (funcArg.GetArgc() >= NARG_CNT::THREE && !NVal(env, funcArg[NARG_POS::THIRD]).TypeIs(napi_function)) {
-            tie(succ, flags) = NVal(env, funcArg[NARG_POS::THIRD]).ToInt32();
-            if (!succ) {
+            auto [succ, authFlags] = NVal(env, funcArg[NARG_POS::THIRD]).ToInt32();
+            if (!succ || authFlags < 0) {
                 UniError(EINVAL).ThrowErr(env, "Invalid flags");
                 return { false, flags };
             }
+            flags = static_cast<unsigned int>(authFlags);
             (void)CommonFunc::ConvertJsFlags(flags);
         }
     }
diff --git a/interfaces/kits/js/src/mod_fileio/properties/open_v9.cpp b/interfaces/kits/js/src/mod_fileio/properties/open_v9.cpp
index 0ccb51d75..acde01e4b 100644
--- a/interfaces/kits/js/src/mod_fileio/properties/open_v9.cpp
+++ b/interfaces/kits/js/src/mod_fileio/properties/open_v9.cpp
@@ -39,16 +39,16 @@ namespace DistributedFS {
 namespace ModuleFileIO {
 using namespace std;
 
-static tuple<bool, int> GetJsFlags(napi_env env, const NFuncArg &funcArg)
+static tuple<bool, unsigned int> GetJsFlags(napi_env env, const NFuncArg &funcArg)
 {
-    int mode = O_RDONLY;
-    bool succ = false;
+    unsigned int mode = O_RDONLY;
     if (funcArg.GetArgc() >= NARG_CNT::TWO && NVal(env, funcArg[NARG_POS::SECOND]).TypeIs(napi_number)) {
-        tie(succ, mode) = NVal(env, funcArg[NARG_POS::SECOND]).ToInt32();
+        auto [succ, authMode] = NVal(env, funcArg[NARG_POS::SECOND]).ToInt32();
         if (!succ) {
             UniError(EINVAL, true).ThrowErr(env);
             return { false, mode };
         }
+        mode = static_cast<unsigned int>(authMode);
         (void)CommonFunc::ConvertJsFlags(mode);
     }
     return { true, mode };
diff --git a/interfaces/kits/js/src/mod_fs/properties/open.cpp b/interfaces/kits/js/src/mod_fs/properties/open.cpp
index f01e35b0b..b3f81c2dd 100644
--- a/interfaces/kits/js/src/mod_fs/properties/open.cpp
+++ b/interfaces/kits/js/src/mod_fs/properties/open.cpp
@@ -43,15 +43,15 @@ using namespace OHOS::AppExecFwk;
 static tuple<bool, unsigned int> GetJsFlags(napi_env env, const NFuncArg &funcArg)
 {
     unsigned int mode = O_RDONLY;
-    bool succ = false;
     if (funcArg.GetArgc() >= NARG_CNT::TWO && NVal(env, funcArg[NARG_POS::SECOND]).TypeIs(napi_number)) {
-        tie(succ, mode) = NVal(env, funcArg[NARG_POS::SECOND]).ToInt32();
+        auto [succ, authMode] = NVal(env, funcArg[NARG_POS::SECOND]).ToInt32();
         unsigned int invalidMode = (O_WRONLY | O_RDWR);
-        if (!succ || ((mode & invalidMode) == invalidMode)) {
+        if (!succ || authMode < 0 || ((authMode & invalidMode) == invalidMode)) {
             HILOGE("Invalid mode");
             NError(EINVAL).ThrowErr(env);
             return { false, mode };
         }
+        mode = static_cast<unsigned int>(authMode);
         (void)CommonFunc::ConvertJsFlags(mode);
     }
     return { true, mode };
-- 
Gitee