Fix for a regex bug that leads into an infinite loop due to optimization

failure when the pattern is ".*" and both MULTILINE and SINGLELINE options are
specified.
# This bug was already squashed in HEAD, as it adopts an alternative
# implementation.

diff --git a/ext/mbstring/mbregex.c b/ext/mbstring/mbregex.c
index 1e6c6effc1608f029493cbbdd1861abaf528c91c..cfda5b4404114ec5b8b4153c4efcf75f3e37b696 100644 (file)
--- a/ext/mbstring/mbregex.c
+++ b/ext/mbstring/mbregex.c
@@ -3326,7 +3326,7 @@ re_search(bufp, string, size, startpos, range, regs)
     }
   }
   if (bufp->options & MBRE_OPTIMIZE_ANCHOR) {
-    if (bufp->options&MBRE_OPTION_SINGLELINE) {
+    if (bufp->options&MBRE_OPTION_MULTILINE & range > 0) {
       goto begbuf_match;
     }
     anchor = 1;