grep branch, master, updated. v2.11-5-g12c957f

[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  12c957f786b12a4dd116f9c40a715d671d17fa16 (commit)
      from  d0bb7f9c1505f08362dbf107d47d8d6795c93fbf (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=12c957f786b12a4dd116f9c40a715d671d17fa16


commit 12c957f786b12a4dd116f9c40a715d671d17fa16
Author: Allan McRae <address@hidden>
Date:   Mon Mar 12 09:28:01 2012 +0100

    grep: fix segfault with -r --exclude-dir and no file operand
    
    * src/main.c (grepdir): Don't invoke excluded_file_name on NULL.
    * NEWS (Bug fixes): Mention it.

diff --git a/NEWS b/NEWS
index d0a63d5..d4d70f5 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,11 @@ GNU grep NEWS                                    -*- outline 
-*-
 
 * Noteworthy changes in release ?.? (????-??-??) [?]
 
+** Bug fixes
+
+   grep no longer segfaults with -r --exclude-dir and no file operand.
+   I.e., ":|grep -r --exclude-dir=D PAT" would segfault.
+
 
 * Noteworthy changes in release 2.11 (2012-03-02) [stable]
 
diff --git a/src/main.c b/src/main.c
index 2f6c761..f4f1235 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1361,7 +1361,7 @@ grepdir (char const *dir, struct stats const *stats)
   struct stats const *ancestor;
   char *name_space;
   int status = 1;
-  if (excluded_directory_patterns
+  if (dir && excluded_directory_patterns
       && excluded_file_name (excluded_directory_patterns, dir))
     return 1;
 

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

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


hooks/post-receive
-- 
grep