From a946feb1a84fa746bac32fd6f907715ea7e353fb Mon Sep 17 00:00:00 2001
From: liubb <1653617791@qq.com>
Date: Mon, 28 Sep 2020 12:27:59 +0800
Subject: [PATCH 1/4] =?UTF-8?q?update=20js/builtin/filekit/src/nativeapi?=
 =?UTF-8?q?=5Ffs=5Fimpl.c.=20utils=20=E5=8E=BB=E9=99=A4=E5=86=97=E4=BD=99?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 js/builtin/filekit/src/nativeapi_fs_impl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/builtin/filekit/src/nativeapi_fs_impl.c b/js/builtin/filekit/src/nativeapi_fs_impl.c
index 51f4461..03f142e 100755
--- a/js/builtin/filekit/src/nativeapi_fs_impl.c
+++ b/js/builtin/filekit/src/nativeapi_fs_impl.c
@@ -48,7 +48,7 @@ static bool IsValidPath(const char* path)
 static int GetRealPath(const char* originPath, char* trustPath, size_t tPathLen)
 {
 #if (defined _WIN32 || defined _WIN64)
-    if (PathCanonicalize(originPath, trustPath) == true) {
+    if (PathCanonicalize(trustPath, originPath)) {
         return NATIVE_SUCCESS;
     }
 #else
-- 
Gitee


From 5bf9042659081ce696b98c8102b0032b1eafaf4b Mon Sep 17 00:00:00 2001
From: liubb <1653617791@qq.com>
Date: Mon, 28 Sep 2020 12:30:24 +0800
Subject: [PATCH 2/4] =?UTF-8?q?update=20js/builtin/kvstorekit/src/nativeap?=
 =?UTF-8?q?i=5Fkv=5Fimpl.c.=20utils=E5=8E=BB=E9=99=A4=E5=86=97=E4=BD=99?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 js/builtin/kvstorekit/src/nativeapi_kv_impl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/builtin/kvstorekit/src/nativeapi_kv_impl.c b/js/builtin/kvstorekit/src/nativeapi_kv_impl.c
index a136df6..bfbcd66 100755
--- a/js/builtin/kvstorekit/src/nativeapi_kv_impl.c
+++ b/js/builtin/kvstorekit/src/nativeapi_kv_impl.c
@@ -59,7 +59,7 @@ static int GetKvFolder(const char* dataPath)
 static int GetRealPath(const char* originPath, char* trustPath, size_t tPathLen)
 {
 #if (defined _WIN32 || defined _WIN64)
-    if (PathCanonicalize(originPath, trustPath) == true) {
+    if (PathCanonicalize(trustPath, originPath)) {
         return NATIVE_SUCCESS;
     }
 #else
-- 
Gitee


From 216288bba699221399a57297bb6fdde8ed54f3d8 Mon Sep 17 00:00:00 2001
From: liubb <1653617791@qq.com>
Date: Mon, 28 Sep 2020 12:40:28 +0800
Subject: [PATCH 3/4] =?UTF-8?q?update=20js/builtin/filekit/src/nativeapi?=
 =?UTF-8?q?=5Ffs=5Fimpl.c.=20utils=E5=85=A5=E5=8F=82=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 js/builtin/filekit/src/nativeapi_fs_impl.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/js/builtin/filekit/src/nativeapi_fs_impl.c b/js/builtin/filekit/src/nativeapi_fs_impl.c
index 03f142e..cfffa4e 100755
--- a/js/builtin/filekit/src/nativeapi_fs_impl.c
+++ b/js/builtin/filekit/src/nativeapi_fs_impl.c
@@ -39,9 +39,6 @@ static bool IsValidPath(const char* path)
     if ((pathLen == 0) || (pathLen > FILE_NAME_MAX_LEN)) {
         return false;
     }
-    if (strpbrk(path, "\"*+,:;<=>\?[]|\x7F")) {
-        return false;
-    }
     return true;
 }
 
-- 
Gitee


From fea67f020bc39ec30164ba77a2a6eb9997b02e4e Mon Sep 17 00:00:00 2001
From: liubb <1653617791@qq.com>
Date: Mon, 28 Sep 2020 12:42:16 +0800
Subject: [PATCH 4/4] =?UTF-8?q?update=20js/builtin/filekit/src/nativeapi?=
 =?UTF-8?q?=5Ffs.cpp.=20utils=E5=85=A5=E5=8F=82=E5=88=A4=E6=96=AD=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 js/builtin/filekit/src/nativeapi_fs.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/js/builtin/filekit/src/nativeapi_fs.cpp b/js/builtin/filekit/src/nativeapi_fs.cpp
index 0237d63..e10490c 100755
--- a/js/builtin/filekit/src/nativeapi_fs.cpp
+++ b/js/builtin/filekit/src/nativeapi_fs.cpp
@@ -42,6 +42,9 @@ bool IsValidPath(const char* path)
     if ((strstr(path, "/./") != nullptr) || (strstr(path, "/../") != nullptr)) {
         return false;
     }
+    if (strpbrk(path + PREFIX_LEN, "\"*+,:;<=>\?[]|\x7F")) {
+        return false;
+    }
     return true;
 }
 
-- 
Gitee