Fix crash when calling absPath with empty input (#620)

Signed-off-by: Zhilei Ren <zren@dlut.edu.cn> Co-authored-by: Ian Chen <ichen@openrobotics.org>
gazebosim · Aug 9, 2024 · e818abc · e818abc
1 parent 85b12c6
commit e818abc
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/src/Filesystem.cc b/src/Filesystem.cc
@@ -135,7 +135,14 @@ std::string common::copyToUnixPath(const std::string &_path)
 /////////////////////////////////////////////////
 std::string common::absPath(const std::string &_path)
 {
-  return fs::absolute(_path).string();
+  std::error_code ec;
+  auto path = fs::absolute(_path, ec);
+  if (!fsWarn("absPath", ec))
+  {
+    path = "";
+  }
+
+  return path.string();
 }
 
 /////////////////////////////////////////////////

diff --git a/src/Filesystem_TEST.cc b/src/Filesystem_TEST.cc
@@ -636,3 +636,13 @@ TEST_F(FilesystemTest, separator)
   EXPECT_EQ("\\", gz::common::separator(""));
 #endif
 }
+
+/////////////////////////////////////////////////
+TEST_F(FilesystemTest, empty)
+{
+#ifdef __APPLE__
+  EXPECT_EQ(common::absPath(""), gz::common::cwd() + "/");
+#else
+  EXPECT_EQ(common::absPath(""), "");
+#endif
+}