summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS5
-rw-r--r--src/kwsearch.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 1c491d0a..a9ee5c02 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,11 @@ GNU grep NEWS -*- outline -*-
* Noteworthy changes in release ?.? (????-??-??) [?]
+** Bug fixes
+
+ Searching with grep -Fw for an empty string would not match an
+ empty line. [bug present since "the beginning"]
+
* Noteworthy changes in release 2.6.3 (2010-04-02) [stable]
diff --git a/src/kwsearch.c b/src/kwsearch.c
index b03ff0cd..9244a8a2 100644
--- a/src/kwsearch.c
+++ b/src/kwsearch.c
@@ -133,12 +133,14 @@ Fexecute (char const *buf, size_t size, size_t *match_size,
goto success;
}
else if (match_words)
- for (try = beg; len; )
+ for (try = beg; ; )
{
if (try > buf && WCHAR((unsigned char) try[-1]))
break;
if (try + len < buf + size && WCHAR((unsigned char) try[len]))
{
+ if (!len)
+ break;
offset = kwsexec (kwset, beg, --len, &kwsmatch);
if (offset == (size_t) -1)
break;