util: Fix segfault when doing a backup with an empty backup_path

Revert change of 'util: Fix occurances where back() might be called on an empty string' for `zenfs_tool_backup()`. Otherwise test/utils/0040_backup.sh segfaults when building ZenFS with RocksDB 6.29.fb (c++11). Signed-off-by: Dennis Maisenbacher <[email protected]> Signed-off-by: Hans Holmberg <[email protected]>
westerndigitalcorporation · Oct 24, 2023 · 8337de1 · 8337de1
1 parent 7ce4100
commit 8337de1
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/util/zenfs.cc b/util/zenfs.cc
@@ -520,7 +520,7 @@ int zenfs_tool_backup() {
     }
 
     std::string backup_path = FLAGS_backup_path;
-    AddDirSeparatorAtEnd(backup_path);
+    if (backup_path.size() > 0 && backup_path.back() != '/') backup_path += "/";
     io_status = zenfs_tool_copy_dir(zenFS.get(), backup_path,
                                     FileSystem::Default().get(), FLAGS_path);
   }