make string at least empty (instead of containing garbage) if malloc() failed

[wxWidgets.git] / src / common / regex.cpp

diff --git a/src/common/regex.cpp b/src/common/regex.cpp
index 943fc2c46b4447128ad40dd8b9a5da734b8e0fa0..e96257c8b6898816d905566c336c034f85b595b2 100644 (file)
--- a/src/common/regex.cpp
+++ b/src/common/regex.cpp
@@ -204,21 +204,24 @@ bool wxRegExImpl::Compile(const wxString& expr, int flags)
             m_nMatches = 1;
 
             // and some more for bracketed subexperessions
             m_nMatches = 1;
 
             // and some more for bracketed subexperessions

-            const wxChar *cptr = expr.c_str();
-            wxChar prev = _T('\0');
-            while ( *cptr != _T('\0') )
+            for ( const wxChar *cptr = expr.c_str(); *cptr; cptr++ )

             {
             {

-                // is this a subexpr start, i.e. "(" for extended regex or
-                // "\(" for a basic one?
-                if ( *cptr == _T('(') &&
-                     (flags & wxRE_BASIC ? prev == _T('\\')
-                                         : prev != _T('\\')) )
+                if ( *cptr == _T('\\') )

                 {
                 {

+                    // in basic RE syntax groups are inside \(...\)
+                    if ( *++cptr == _T('(') && (flags & wxRE_BASIC) )
+                    {
+                        m_nMatches++;
+                    }
+                }
+                else if ( *cptr == _T('(') && !(flags & wxRE_BASIC) )
+                {
+                    // we know that the previous character is not an unquoted
+                    // backslash because it would have been eaten above, so we
+                    // have a bar '(' and this indicates a group start for the
+                    // extended syntax

                     m_nMatches++;
                 }
                     m_nMatches++;
                 }

-
-                prev = *cptr;
-                cptr++;

             }
         }
 
             }
         }