From 3675c054f29a5ca413d11f86ef43636fdc2c14c7 Mon Sep 17 00:00:00 2001
From: Jeremyzz <mazhao12@huawei.com>
Date: Wed, 10 May 2023 10:30:33 +0800
Subject: [PATCH] fix emptyFieldNameBUG

Signed-off-by: Jeremyzz <mazhao12@huawei.com>
---
 .../src/executor/document/document_check.cpp    | 17 +++++++++++++----
 .../test/unittest/api/documentdb_find_test.cpp  |  9 +++++++++
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/executor/document/document_check.cpp b/services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/executor/document/document_check.cpp
index 94bb5138..2763a970 100644
--- a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/executor/document/document_check.cpp
+++ b/services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/executor/document/document_check.cpp
@@ -99,9 +99,12 @@ int CheckCommon::CheckFilter(JsonObject &filterObj, bool &isOnlyId, std::vector<
         isOnlyId = false;
     }
     for (int i = 0; i < filterPath.size(); i++) {
+        if (filterPath[i].empty()) {
+            return -E_INVALID_JSON_FORMAT;
+        }
         for (int j = 0; j < filterPath[i].size(); j++) {
-            if (filterPath[i].empty()) {
-                return -E_INVALID_JSON_FORMAT;
+            if (filterPath[i][j].empty()) {
+                return -E_INVALID_ARGS;
             }
             for (auto oneChar : filterPath[i][j]) {
                 if (!((isalpha(oneChar)) || (isdigit(oneChar)) || ('_' == oneChar))) {
@@ -246,6 +249,9 @@ int CheckCommon::CheckUpdata(JsonObject &updataObj, std::vector<std::vector<std:
             return -E_INVALID_JSON_FORMAT;
         }
         for (int j = 0; j < path[i].size(); j++) {
+            if (path[i][j].empty()) {
+                return -E_INVALID_ARGS;
+            }
             for (auto oneChar : path[i][j]) {
                 if (!((isalpha(oneChar)) || (isdigit(oneChar)) || ('_' == oneChar))) {
                     return -E_INVALID_ARGS;
@@ -284,9 +290,12 @@ int CheckCommon::CheckProjection(JsonObject &projectionObj, std::vector<std::vec
         }
     }
     for (int i = 0; i < path.size(); i++) {
+        if (path[i].empty()) {
+            return -E_INVALID_JSON_FORMAT;
+        }
         for (auto fieldName : path[i]) {
-            if (path[i].empty()) {
-                return -E_INVALID_JSON_FORMAT;
+            if (fieldName.empty()) {
+                return -E_INVALID_ARGS;
             }
             for (int j = 0; j < fieldName.size(); j++) {
                 if (!((isalpha(fieldName[j])) || (isdigit(fieldName[j])) || ('_' == fieldName[j]))) {
diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/test/unittest/api/documentdb_find_test.cpp b/services/distributeddataservice/service/data_share/gaussdb_rd_simple/test/unittest/api/documentdb_find_test.cpp
index 807cc4bf..3b568363 100644
--- a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/test/unittest/api/documentdb_find_test.cpp
+++ b/services/distributeddataservice/service/data_share/gaussdb_rd_simple/test/unittest/api/documentdb_find_test.cpp
@@ -1543,3 +1543,12 @@ HWTEST_F(DocumentFindApiTest, DocumentFindApiTest059, TestSize.Level1)
     Query query = { filter, projection };
     EXPECT_EQ(GRD_FindDoc(g_db, COLLECTION_NAME, query, 1, &resultSet), GRD_INVALID_FORMAT);
 }
+
+HWTEST_F(DocumentFindApiTest, DocumentFindApiTest060, TestSize.Level1)
+{
+    const char *filter = "{}";
+    GRD_ResultSet *resultSet = nullptr;
+    const char *projection = R"({"abc123_.":1})";
+    Query query = { filter, projection };
+    EXPECT_EQ(GRD_FindDoc(g_db, COLLECTION_NAME, query, 1, &resultSet), GRD_INVALID_ARGS);
+}
\ No newline at end of file
-- 
Gitee