fix parser memeory leak (#3575)

vesoft-inc · Dec 28, 2021 · 7398d80 · 7398d80
1 parent 74464bf
commit 7398d80
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 10 deletions.
diff --git a/src/kvstore/raftex/Host.cpp b/src/kvstore/raftex/Host.cpp
@@ -375,11 +375,8 @@ folly::Future<cpp2::AppendLogResponse> Host::sendAppendLogRequest(
   return client->future_appendLog(*req);
 }
 
-folly::Future<cpp2::HeartbeatResponse> Host::sendHeartbeat(folly::EventBase* eb,
-                                                           TermID term,
-                                                           LogID commitLogId,
-                                                           TermID lastLogTerm,
-                                                           LogID lastLogId) {
+folly::Future<cpp2::HeartbeatResponse> Host::sendHeartbeat(
+    folly::EventBase* eb, TermID term, LogID commitLogId, TermID lastLogTerm, LogID lastLogId) {
   auto req = std::make_shared<cpp2::HeartbeatRequest>();
   req->space_ref() = part_->spaceId();
   req->part_ref() = part_->partitionId();

diff --git a/src/kvstore/raftex/Host.h b/src/kvstore/raftex/Host.h
@@ -89,11 +89,8 @@ class Host final : public std::enable_shared_from_this<Host> {
       TermID lastLogTermSent,  // The last log term being sent
       LogID lastLogIdSent);    // The last log id being sent
 
-  folly::Future<cpp2::HeartbeatResponse> sendHeartbeat(folly::EventBase* eb,
-                                                       TermID term,
-                                                       LogID commitLogId,
-                                                       TermID lastLogTerm,
-                                                       LogID lastLogId);
+  folly::Future<cpp2::HeartbeatResponse> sendHeartbeat(
+      folly::EventBase* eb, TermID term, LogID commitLogId, TermID lastLogTerm, LogID lastLogId);
 
   const HostAddr& address() const {
     return addr_;

diff --git a/src/parser/parser.yy b/src/parser/parser.yy
@@ -2597,6 +2597,7 @@ index_field
     }
     | name_label L_PAREN INTEGER R_PAREN {
         if ($3 > std::numeric_limits<int16_t>::max()) {
+            delete $1;
             throw nebula::GraphParser::syntax_error(@3, "Out of range:");
         }
         $$ = new meta::cpp2::IndexFieldDef();
@@ -2905,6 +2906,8 @@ match_sentences
 assignment_sentence
     : VARIABLE ASSIGN set_sentence {
         if (qctx->existParameter(*$1)) {
+            delete $1;
+            delete $3;
             throw nebula::GraphParser::syntax_error(@1, "Variable definition conflicts with a parameter");
         } else {
             $$ = new AssignmentSentence($1, $3);

diff --git a/src/parser/test/ParserTest.cpp b/src/parser/test/ParserTest.cpp
@@ -3260,6 +3260,21 @@ TEST_F(ParserTest, DetectMemoryLeakTest) {
     ASSERT_EQ(result.value()->toString(),
               "YIELD reduce(totalNum = 10, n IN range(1,3) | (totalNum+n))");
   }
+  {
+    std::string query = "CREATE TAG INDEX IF NOT EXISTS std_index ON t1(c1(4294967296), c2)";
+    auto result = parse(query);
+    ASSERT_FALSE(result.ok()) << result.status();
+    ASSERT_EQ(result.status().toString(), "SyntaxError: Out of range: near `4294967296'");
+  }
+  {
+    std::string query = "$param = GO FROM 'Tony Parker' over like YIELD like._dst AS vv";
+    auto* ectx = qctx_->ectx();
+    ectx->setValue("param", "TestData");
+    auto result = parse(query);
+    ASSERT_FALSE(result.ok()) << result.status();
+    ASSERT_EQ(result.status().toString(),
+              "SyntaxError: Variable definition conflicts with a parameter near `$param'");
+  }
 }
 
 TEST_F(ParserTest, TestNameLabel) {