Dot matches newlines in regexps (#401)

in filter and search, otherwise surprising behavior if payload contains newline chars Signed-off-by: Tobias Hammer <[email protected]>
COVESA · Jan 19, 2024 · 3fb30fc · 3fb30fc
1 parent 8311c5a
commit 3fb30fc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/qdlt/qdltfilter.cpp b/qdlt/qdltfilter.cpp
@@ -151,8 +151,9 @@ bool QDltFilter::compileRegexps()
         ignoreCase_Header ? QRegularExpression::CaseInsensitiveOption
                           : QRegularExpression::NoPatternOption);
     payloadRegularExpression.setPatternOptions(
-        ignoreCase_Payload ? QRegularExpression::CaseInsensitiveOption
-                           : QRegularExpression::NoPatternOption);
+        QRegularExpression::DotMatchesEverythingOption |
+        (ignoreCase_Payload ? QRegularExpression::CaseInsensitiveOption
+                            : QRegularExpression::NoPatternOption));
 
     return (headerRegularExpression.isValid() &&
             payloadRegularExpression.isValid() &&

diff --git a/src/searchdialog.cpp b/src/searchdialog.cpp
@@ -290,16 +290,10 @@ int SearchDialog::find()
             return 1;
         }
 
-        searchTextRegExpression.setPatternOptions(QRegularExpression::CaseInsensitiveOption);
-        if ( getCaseSensitive() == true )
-        {
-         searchTextRegExpression.setPatternOptions(QRegularExpression::NoPatternOption);
-        }
-        else
-        {
-         searchTextRegExpression.setPatternOptions(QRegularExpression::CaseInsensitiveOption);
-        }
-
+        int options = QRegularExpression::DotMatchesEverythingOption;
+        if (!getCaseSensitive())
+            options |= QRegularExpression::CaseInsensitiveOption;
+        searchTextRegExpression.setPatternOptions(static_cast<QRegularExpression::PatternOption>(options));
     }
 
     //check timestamp search pattern