Merge pull request #1832 from Expensify/main

Update expensify_prod branch
Expensify · Jul 30, 2024 · f7a7694 · f7a7694
2 parents 69ecfbf + 116d7d0
commit f7a7694
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/libstuff/libstuff.cpp b/libstuff/libstuff.cpp
@@ -2865,8 +2865,10 @@ string SREReplace(const string& regExp, const string& input, const string& repla
         if (i == 0 && result == PCRE2_ERROR_NOMEMORY) {
             // This is the expected case on the first run, there's not enough space to store the result, so we allocate the space and do it again.
             output = (char*)malloc(outSize);
-        } else if (result) {
+        } else if (result < 0) {
             SWARN("Regex replacement failed with result " << result << ", returning nothing.");
+            output = (char*)malloc(1);
+            *output = 0;
             break;
         }
     }

diff --git a/test/tests/LibStuffTest.cpp b/test/tests/LibStuffTest.cpp
@@ -688,6 +688,11 @@ struct LibStuff : tpunit::TestFixture {
         // And test case sensitivity (enabled)
         string result3 = SREReplace("CAT", from, "dinosaur", false);
         ASSERT_EQUAL(result3, expected);
+
+        // Test match groups.
+        string from2 = "a cat did something to a dog";
+        string result4 = SREReplace("cat(.*)dog", from2, "chicken$1horse");
+        ASSERT_EQUAL(result4, "a chicken did something to a horse");
     }
 
     void SQResultTest() {