Fix regex match failures for backrefs combined with non-greedy quantifiers.

An ancient logic error in cfindloop() could cause the regex engine to fail
to find matches that begin later than the start of the string.  This
function is only used when the regex pattern contains a back reference,
and so far as we can tell the error is only reachable if the pattern is
non-greedy (i.e. its first quantifier uses the ? modifier).  Furthermore,
the actual match must begin after some potential match that satisfies the
DFA but then fails the back-reference's match test.

Reported and fixed by Jeevan Chalke, with cosmetic adjustments by me.

diff --git a/src/backend/regex/regexec.c b/src/backend/regex/regexec.c
index 3df859f36816e6dddfba81df05b66b60fc3baccf..abcb5e7439f35f88a81c55ade68325b43034d408 100644 (file)
--- a/src/backend/regex/regexec.c
+++ b/src/backend/regex/regexec.c
@@ -467,19 +467,21 @@ cfindloop(struct vars * v,
                                        *coldp = cold;
                                        return er;
                                }
-                               if ((shorter) ? end == estop : end == begin)
-                               {
-                                       /* no point in trying again */
-                                       *coldp = cold;
-                                       return REG_NOMATCH;
-                               }
-                               /* go around and try again */
+                               /* try next shorter/longer match with same begin point */
                                if (shorter)
+                               {
+                                       if (end == estop)
+                                               break;  /* NOTE BREAK OUT */
                                        estart = end + 1;
+                               }
                                else
+                               {
+                                       if (end == begin)
+                                               break;  /* NOTE BREAK OUT */
                                        estop = end - 1;
-                       }
-               }
+                               }
+                       }                                       /* end loop over endpoint positions */
+               }                                               /* end loop over beginning positions */
        } while (close < v->stop);
 
        *coldp = cold;