Fix the crash caused by a nullptr variable (#5100)

* remove nullptr. * fix another line. * revise codes.
vesoft-inc · Dec 26, 2022 · a8fee05 · a8fee05
1 parent 3fa3c5d
commit a8fee05
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/src/clients/storage/StorageClientBase-inl.h b/src/clients/storage/StorageClientBase-inl.h
@@ -198,14 +198,20 @@ folly::Future<StatusOr<Response>> StorageClientBase<ClientType, ClientManagerTyp
 
         using TransportException = apache::thrift::transport::TTransportException;
         auto ex = exWrapper.get_exception<TransportException>();
-        if (ex && ex->getType() == TransportException::TIMED_OUT) {
-          LOG(ERROR) << "Request to " << host << " time out: " << ex->what();
+        if (ex) {
+          if (ex->getType() == TransportException::TIMED_OUT) {
+            LOG(ERROR) << "Request to " << host << " time out: " << ex->what();
+            return Status::Error("RPC failure in StorageClient with timeout: %s", ex->what());
+          } else {
+            LOG(ERROR) << "Request to " << host << " failed: " << ex->what();
+            return Status::Error("RPC failure in StorageClient: %s", ex->what());
+          }
         } else {
           auto partsId = getReqPartsId(request);
           invalidLeader(spaceId, partsId);
-          LOG(ERROR) << "Request to " << host << " failed: " << ex->what();
+          LOG(ERROR) << "Request to " << host << " failed.";
+          return Status::Error("RPC failure in StorageClient.");
         }
-        return Status::Error("RPC failure in StorageClient, probably timeout: %s", ex->what());
       });
 }