Issue #1126 graphd crashed (#1128)

Fixed an issue that encountered an unimplemented grammar that could cause a crash.
vesoft-inc · Oct 22, 2019 · c18a3a3 · c18a3a3
1 parent 27663d6
commit c18a3a3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/graph/Executor.cpp b/src/graph/Executor.cpp
@@ -164,11 +164,11 @@ std::unique_ptr<Executor> Executor::makeExecutor(Sentence *sentence) {
             executor = std::make_unique<LimitExecutor>(sentence, ectx());
             break;
         case Sentence::Kind::kUnknown:
-            LOG(FATAL) << "Sentence kind unknown";
-            break;
+            LOG(ERROR) << "Sentence kind unknown";
+            return nullptr;
         default:
-            LOG(FATAL) << "Sentence kind illegal: " << kind;
-            break;
+            LOG(ERROR) << "Sentence kind illegal: " << kind;
+            return nullptr;
     }
     return executor;
 }

diff --git a/src/graph/SequentialExecutor.cpp b/src/graph/SequentialExecutor.cpp
@@ -23,7 +23,9 @@ Status SequentialExecutor::prepare() {
     for (auto i = 0U; i < sentences_->sentences_.size(); i++) {
         auto *sentence = sentences_->sentences_[i].get();
         auto executor = makeExecutor(sentence);
-        DCHECK(executor != nullptr);
+        if (executor == nullptr) {
+            return Status::Error("The statement has not been implemented");
+        }
         auto status = executor->prepare();
         if (!status.ok()) {
             FLOG_ERROR("Prepare executor `%s' failed: %s",