- Prevent infinite loop in ppdc (STR #3293).

This commit is contained in:
Tim Waugh 2009-08-21 14:50:22 +00:00
parent bd993594d6
commit 4ce924500d
2 changed files with 18 additions and 1 deletions

12
cups-str3293.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up cups-1.4rc1/ppdc/ppdc-source.cxx.ppdc-busy-loop cups-1.4rc1/ppdc/ppdc-source.cxx
--- cups-1.4rc1/ppdc/ppdc-source.cxx.ppdc-busy-loop 2009-08-21 15:40:16.648189657 +0100
+++ cups-1.4rc1/ppdc/ppdc-source.cxx 2009-08-21 15:41:29.896188142 +0100
@@ -1321,7 +1321,7 @@ ppdcSource::get_integer(const char *v) /
while (*v && *v != ')')
{
// Skip leading whitespace...
- while (*v && isspace(*v & 255));
+ while (*v && isspace(*v & 255))
v ++;
if (!*v || *v == ')')

View File

@ -10,7 +10,7 @@
Summary: Common Unix Printing System
Name: cups
Version: 1.4
Release: 0.%{pre}.17%{?dist}.1
Release: 0.%{pre}.18%{?dist}
License: GPLv2
Group: System Environment/Daemons
Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?pre}%{?svn}-source.tar.bz2
@ -68,6 +68,7 @@ Patch40: cups-str3285.patch
Patch41: cups-str3279.patch
Patch42: cups-str3287.patch
Patch43: cups-str3292.patch
Patch44: cups-str3293.patch
Patch100: cups-lspp.patch
Epoch: 1
Url: http://www.cups.org/
@ -236,6 +237,7 @@ module.
%patch41 -p1 -b .str3279
%patch42 -p1 -b .str3287
%patch43 -p1 -b .str3292
%patch44 -p1 -b .str3293
%if %lspp
%patch100 -p1 -b .lspp
@ -530,6 +532,9 @@ rm -rf $RPM_BUILD_ROOT
%{php_extdir}/phpcups.so
%changelog
* Fri Aug 21 2009 Tim Waugh <twaugh@redhat.com> 1:1.4-0.rc1.18
- Prevent infinite loop in ppdc (STR #3293).
* Fri Aug 21 2009 Tomas Mraz <tmraz@redhat.com> - 1:1.4-0.rc1.17.1
- rebuilt with new audit