RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: pcre Date: 24-Jun-2016 10:55:45
Branch: HEAD Handle: 2016062408554500
Modified files:
pcre pcregrep.c
Log:
- pcregrep:
pcre-8.39-Fix-bad-interaction-between-o-and-M-in-pcregrep.patch
Summary:
Revision Changes Path
1.11 +6 -0 pcre/pcregrep.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: pcre/pcregrep.c
============================================================================
$ cvs diff -u -r1.10 -r1.11 pcregrep.c
--- pcre/pcregrep.c 24 Jun 2016 08:45:31 -0000 1.10
+++ pcre/pcregrep.c 24 Jun 2016 08:55:45 -0000 1.11
@@ -1803,6 +1803,12 @@
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)
{
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
