Merge pull request #3140 from udif/pr_comment_bug

Bugfix: core dump when 3 or more slashes (///) are found in a command-line-argument file ( -f file )
chipsalliance · Aug 9, 2022 · b2e6116 · b2e6116
2 parents a8bf952 + c87b94c
commit b2e6116
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/Utils/StringUtils.cpp b/src/Utils/StringUtils.cpp
@@ -295,7 +295,7 @@ std::string StringUtils::removeComments(std::string_view text) {
   char c1 = '\0';
   bool inComment = 0;
   for (char c2 : text) {
-    if ((c2 == '/') && (c1 == '/')) {
+    if ((c2 == '/') && (c1 == '/') && !inComment) {
       inComment = true;
       result.erase(result.end() - 1);
     }

diff --git a/src/Utils/StringUtils_test.cpp b/src/Utils/StringUtils_test.cpp
@@ -216,6 +216,7 @@ TEST(StringUtilsTest, SplitLines) {
 }
 
 TEST(StringUtilsTest, RemoveComments) {
+  EXPECT_EQ("hello ", StringUtils::removeComments("hello /// world"));
   EXPECT_EQ("hello ", StringUtils::removeComments("hello // world"));
   EXPECT_EQ("hello ", StringUtils::removeComments("hello # world"));
   EXPECT_EQ("hello \nworld",