- Prevent 'grep -Fw ""' from busy-looping (bug #169524).

This commit is contained in:
Tim Waugh 2005-09-29 12:10:05 +00:00
parent 18496216e4
commit e4c786c812
2 changed files with 5 additions and 2 deletions

View File

@ -598,7 +598,7 @@
- if (offset == (size_t) -1) - if (offset == (size_t) -1)
- { - {
+ { + {
+ while (1) + while (len)
+ { + {
+ int word_match = 0; + int word_match = 0;
+ if (beg > buf) + if (beg > buf)

View File

@ -1,7 +1,7 @@
Summary: The GNU versions of grep pattern matching utilities. Summary: The GNU versions of grep pattern matching utilities.
Name: grep Name: grep
Version: 2.5.1 Version: 2.5.1
Release: 50 Release: 51
License: GPL License: GPL
Group: Applications/Text Group: Applications/Text
Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}a.tar.bz2 Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}a.tar.bz2
@ -92,6 +92,9 @@ fi
%{_mandir}/*/* %{_mandir}/*/*
%changelog %changelog
* Thu Sep 29 2005 Tim Waugh <twaugh@redhat.com> 2.5.1-51
- Prevent 'grep -Fw ""' from busy-looping (bug #169524).
* Tue Jun 28 2005 Tim Waugh <twaugh@redhat.com> 2.5.1-50 * Tue Jun 28 2005 Tim Waugh <twaugh@redhat.com> 2.5.1-50
- Further fixing for bug #161700. - Further fixing for bug #161700.