From e4c786c812dcce4c07e11e728a2b19727ffc0197 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Thu, 29 Sep 2005 12:10:05 +0000 Subject: [PATCH] - Prevent 'grep -Fw ""' from busy-looping (bug #169524). --- grep-2.5.1-egf-speedup.patch | 2 +- grep.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/grep-2.5.1-egf-speedup.patch b/grep-2.5.1-egf-speedup.patch index 3680f91..08e92c7 100644 --- a/grep-2.5.1-egf-speedup.patch +++ b/grep-2.5.1-egf-speedup.patch @@ -598,7 +598,7 @@ - if (offset == (size_t) -1) - { + { -+ while (1) ++ while (len) + { + int word_match = 0; + if (beg > buf) diff --git a/grep.spec b/grep.spec index 08967f6..5fadf05 100644 --- a/grep.spec +++ b/grep.spec @@ -1,7 +1,7 @@ Summary: The GNU versions of grep pattern matching utilities. Name: grep Version: 2.5.1 -Release: 50 +Release: 51 License: GPL Group: Applications/Text Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}a.tar.bz2 @@ -92,6 +92,9 @@ fi %{_mandir}/*/* %changelog +* Thu Sep 29 2005 Tim Waugh 2.5.1-51 +- Prevent 'grep -Fw ""' from busy-looping (bug #169524). + * Tue Jun 28 2005 Tim Waugh 2.5.1-50 - Further fixing for bug #161700.