grep branch, master, updated. v2.20-20-g5610ec0

[Paul Eggert]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  5610ec0ddb5db823ea3164d60a85064fd8f1aae6 (commit)
      from  16fc7fa0e0f273fa81e382b4303617d707364902 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=5610ec0ddb5db823ea3164d60a85064fd8f1aae6


commit 5610ec0ddb5db823ea3164d60a85064fd8f1aae6
Author: Paul Eggert <address@hidden>
Date:   Wed Sep 10 00:04:58 2014 -0700

    grep: port recent fix to older pcre version
    
    * src/pcresearch.c (Pexecute): Don't assume that a pcre_exec
    that returns PCRE_ERROR_NOMATCH leaves its sub argument alone.
    This assumption is false for libpcre-3 version 8.31-2ubuntu2.

diff --git a/src/pcresearch.c b/src/pcresearch.c
index 2a01e6d..4e2ccf8 100644
--- a/src/pcresearch.c
+++ b/src/pcresearch.c
@@ -157,14 +157,16 @@ Pexecute (char const *buf, size_t size, size_t 
*match_size,
       /* Treat encoding-error bytes as data that cannot match.  */
       for (;;)
         {
+          int valid_bytes;
           e = pcre_exec (cre, extra, p, line_end - p, 0, options, sub, nsub);
           if (e != PCRE_ERROR_BADUTF8)
             break;
-          e = pcre_exec (cre, extra, p, sub[0], 0,
+          valid_bytes = sub[0];
+          e = pcre_exec (cre, extra, p, valid_bytes, 0,
                          options | PCRE_NO_UTF8_CHECK, sub, nsub);
           if (e != PCRE_ERROR_NOMATCH)
             break;
-          p += sub[0] + 1;
+          p += valid_bytes + 1;
           options = PCRE_NOTBOL;
         }
 

-----------------------------------------------------------------------

Summary of changes:
 src/pcresearch.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
grep