summaryrefslogtreecommitdiff
path: root/pcre/pcregrep.c
diff options
context:
space:
mode:
Diffstat (limited to 'pcre/pcregrep.c')
-rw-r--r--pcre/pcregrep.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/pcre/pcregrep.c b/pcre/pcregrep.c
index cd53c648da2..fd2a67622ba 100644
--- a/pcre/pcregrep.c
+++ b/pcre/pcregrep.c
@@ -1803,6 +1803,12 @@ while (ptr < endptr)
match = FALSE;
if (line_buffered) fflush(stdout);
rc = 0; /* Had some success */
+
+ /* If the current match ended past the end of the line (only possible
+ in multiline mode), we are done with this line. */
+
+ if ((unsigned int)offsets[1] > linelength) goto END_ONE_MATCH;
+
startoffset = offsets[1]; /* Restart after the match */
if (startoffset <= oldstartoffset)
{