grep branch, master, updated. v2.18-81-gf084979

[Jim Meyering]

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  f08497935213250eb1aba9604a5418f2f7c41880 (commit)
      from  5190041fe515743ef4545abf287d243bc025c701 (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=f08497935213250eb1aba9604a5418f2f7c41880


commit f08497935213250eb1aba9604a5418f2f7c41880
Author: Jim Meyering <address@hidden>
Date:   Fri Apr 18 10:12:28 2014 -0700

    maint: Revert "dfa: avoid new NULL dereference"
    
    This reverts commit 5190041fe515743ef4545abf287d243bc025c701.
    It was only a bug if one neglected to update to the latest gnulib.
    With the newer xn2realloc, there is no problem.

diff --git a/src/dfa.c b/src/dfa.c
index 8463762..eeca257 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -643,7 +643,7 @@ dfa_charclass_index (struct dfa *d, charclass const s)
   for (i = 0; i < d->cindex; ++i)
     if (equal (s, d->charclasses[i]))
       return i;
-  d->charclasses = maybe_realloc (d->charclasses, d->cindex + 1, &d->calloc,
+  d->charclasses = maybe_realloc (d->charclasses, d->cindex, &d->calloc,
                                   sizeof *d->charclasses);
   ++d->cindex;
   copyset (s, d->charclasses[i]);

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

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


hooks/post-receive
-- 
grep