From bf8a2fc6e515529722a79d59f4e094784dd8c9dc Mon Sep 17 00:00:00 2001 From: Kishore Nallan Date: Wed, 14 Feb 2024 21:39:50 +0530 Subject: [PATCH] Don't accept empty nodes file. --- src/tsconfig.cpp | 4 ++++ src/typesense_server_utils.cpp | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/tsconfig.cpp b/src/tsconfig.cpp index 150c7ce0..08185546 100644 --- a/src/tsconfig.cpp +++ b/src/tsconfig.cpp @@ -98,6 +98,10 @@ Option Config::fetch_file_contents(const std::string & file_path) { std::string content((std::istreambuf_iterator(infile)), (std::istreambuf_iterator())); infile.close(); + if(content.empty()) { + return Option(400, std::string("Empty file at: ") + file_path); + } + return Option(content); } diff --git a/src/typesense_server_utils.cpp b/src/typesense_server_utils.cpp index 2c664d68..5f970d5c 100644 --- a/src/typesense_server_utils.cpp +++ b/src/typesense_server_utils.cpp @@ -245,7 +245,7 @@ int start_raft_server(ReplicationState& replication_state, const std::string& st if(!nodes_config_op.ok()) { LOG(ERROR) << nodes_config_op.error(); - exit(-1); + return -1; } butil::ip_t peering_ip;