Merge pull request #1787 from Expensify/main

Update expensify_prod branch
Expensify · Jun 26, 2024 · 5000e5f · 5000e5f
2 parents ce35fb8 + f636d81
commit 5000e5f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/libstuff/SRandom.cpp b/libstuff/SRandom.cpp
@@ -18,13 +18,13 @@ uint64_t SRandom::rand64() {
     return _distribution64(_generator);
 }
 
-string SRandom::randStr(uint& length) {
+string SRandom::randStr(uint length) {
     string str = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
     string newstr;
     int pos;
-    while(newstr.size() != length) {
+    while (newstr.size() != length) {
         pos = (rand64() % (str.size() - 1));
-        newstr += str.substr(pos,1);
+        newstr += str.substr(pos, 1);
     }
     return newstr;
 }
diff --git a/libstuff/SRandom.h b/libstuff/SRandom.h
@@ -10,7 +10,7 @@ class SRandom {
   public:
     static uint64_t rand64();
     static uint64_t limitedRand64(uint64_t min, uint64_t max);
-    static string randStr(uint& length);
+    static string randStr(uint length);
 
   private:
     static mt19937_64 _generator;

diff --git a/libstuff/libstuff.cpp b/libstuff/libstuff.cpp
@@ -2806,11 +2806,11 @@ bool SIsValidSQLiteDateModifier(const string& modifier) {
 }
 
 bool SREMatch(const string& regExp, const string& s) {
-    return pcrecpp::RE(regExp).FullMatch(s);
+    return pcrecpp::RE(regExp, pcrecpp::RE_Options().set_match_limit_recursion(1000)).FullMatch(s);
 }
 
 bool SREMatch(const string& regExp, const string& s, string& match) {
-    return pcrecpp::RE(regExp).FullMatch(s, &match);
+    return pcrecpp::RE(regExp, pcrecpp::RE_Options().set_match_limit_recursion(1000)).FullMatch(s, &match);
 }
 
 void SRedactSensitiveValues(string& s) {