fix: generate regex only once else regex.assign can crash

elsamuko · Jan 6, 2023 · 62cf1bd · 62cf1bd
1 parent 8619935
commit 62cf1bd
Showing 1 changed file with 16 additions and 10 deletions.
diff --git a/src/searcher/searcherfactory.hpp b/src/searcher/searcherfactory.hpp
@@ -7,20 +7,26 @@
 
 namespace searcherfactory {
 
+namespace {
+std::once_flag rxInitialized;
+}
+
 std::function<Searcher*()> searcherFunc( SearchOptions& opts ) {
 
     if( opts.isRegex ) {
         return [&opts] {
-            rx::regex::flag_type flags = rx::regex::normal;
-
-            if( opts.ignoreCase ) { flags ^= rx::regex::icase; }
-
-            try {
-                opts.regex.assign( opts.term, flags );
-            } catch( const rx::regex_error& e ) {
-                LOG( "Invalid regex: " << e.what() );
-                exit( EXIT_FAILURE );
-            }
+            std::call_once( rxInitialized, [&opts] {
+                rx::regex::flag_type flags = rx::regex::normal;
+
+                if( opts.ignoreCase ) { flags ^= rx::regex::icase; }
+
+                try {
+                    opts.regex.assign( opts.term, flags );
+                } catch( const rx::regex_error& e ) {
+                    LOG( "Invalid regex: " << e.what() );
+                    exit( EXIT_FAILURE );
+                }
+            } );
 
             RegexSearcher* searcher = new RegexSearcher( opts );
             return searcher;