From 5420f93de92852da4e608e7110c8f4bec90b9abe Mon Sep 17 00:00:00 2001 From: John Sully Date: Sat, 9 Feb 2019 07:56:45 -0500 Subject: [PATCH] Fix bug where we try to load a database with no name --- src/server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server.c b/src/server.c index c03a6d9d7..e9eae14e0 100644 --- a/src/server.c +++ b/src/server.c @@ -4590,7 +4590,7 @@ void loadDataFromDisk(void) { if (server.aof_state == AOF_ON) { if (loadAppendOnlyFile(server.aof_filename) == C_OK) serverLog(LL_NOTICE,"DB loaded from append only file: %.3f seconds",(float)(ustime()-start)/1000000); - } else { + } else if (server.rdb_filename != NULL) { rdbSaveInfo rsi = RDB_SAVE_INFO_INIT; if (rdbLoad(server.rdb_filename,&rsi) == C_OK) { serverLog(LL_NOTICE,"DB loaded from disk: %.3f seconds",