grep branch, master, updated. v2.18-148-ga6ae68d

[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  a6ae68d279b68619cd77c714fb2c5e7fb31096f5 (commit)
      from  3b301a71d94eec362f00905be9d2fa2b044f6f83 (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=a6ae68d279b68619cd77c714fb2c5e7fb31096f5


commit a6ae68d279b68619cd77c714fb2c5e7fb31096f5
Author: Paul Eggert <address@hidden>
Date:   Thu May 15 18:46:51 2014 -0700

    grep: port mb_next_wc to RHEL 6.5 x86-64
    
    * src/searchutils.c (mb_next_wc): Work around glibc bug 16950; see:
    https://sourceware.org/bugzilla/show_bug.cgi?id=16950
    This bug was masked in the other GNU/Linux tests I made.  It was
    exposed on RHEL 6.5 x86-64, where the compiler (GCC Red Hat 4.4.7-4)
    happened to use temporaries in a different way.
    Also see recent changes to the Gnulib documentation in this area:
    http://lists.gnu.org/archive/html/bug-gnulib/2014-05/msg00013.html

diff --git a/src/searchutils.c b/src/searchutils.c
index 5eb9a12..18dd584 100644
--- a/src/searchutils.c
+++ b/src/searchutils.c
@@ -285,5 +285,6 @@ mb_next_wc (char const *cur, char const *end)
 {
   wchar_t wc;
   mbstate_t mbs = { 0 };
-  return mbrtowc (&wc, cur, end - cur, &mbs) < (size_t) -2 ? wc : WEOF;
+  return (end - cur != 0 && mbrtowc (&wc, cur, end - cur, &mbs) < (size_t) -2
+          ? wc : WEOF);
 }

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

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


hooks/post-receive
-- 
grep