rpms/cups
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Fixed LSPP patch passing NULL to strcmp (bug #203784).

Browse Source
This commit is contained in:
Tim Waugh 2006-08-24 09:50:28 +00:00
parent 9ad376bf8d
commit d90f3913c7
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cups-lspp.patch
View File

@ -1430,13 +1430,13 @@
+ userfooter = strdup(attr->values[1].string.text); + userfooter = strdup(attr->values[1].string.text);
+ +
+ if ((strcmp(userheader, Classification) == 0) + if ((strcmp(userheader, Classification) == 0)
+ && (strcmp(userfooter, Classification) == 0)) + && userfooter &&(strcmp(userfooter, Classification) == 0))
+ { + {
+ /* + /*
+ * Since both values are Classification, the user is not trying to Override + * Since both values are Classification, the user is not trying to Override
+ */ + */
+ free(userheader); + free(userheader);
+ free(userfooter); + if (userfooter) free(userfooter);
+ userheader = userfooter = NULL; + userheader = userfooter = NULL;
+ } + }
+ } + }

5
cups.spec
View File

@ -6,7 +6,7 @@
Summary: Common Unix Printing System Summary: Common Unix Printing System
Name: cups Name: cups
Version: 1.2.2 Version: 1.2.2
Release: 14 Release: 15
License: GPL License: GPL
Group: System Environment/Daemons Group: System Environment/Daemons
Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@ -420,6 +420,9 @@ rm -rf $RPM_BUILD_ROOT
%{cups_serverbin}/daemon/cups-lpd %{cups_serverbin}/daemon/cups-lpd
%changelog %changelog
* Thu Aug 24 2006 Tim Waugh <twaugh@redhat.com> 1:1.2.2-15
- Fixed LSPP patch passing NULL to strcmp (bug #203784).
* Mon Aug 21 2006 Tim Waugh <twaugh@redhat.com> 1:1.2.2-14 * Mon Aug 21 2006 Tim Waugh <twaugh@redhat.com> 1:1.2.2-14
- Updated LSPP patch (bug #203376). - Updated LSPP patch (bug #203376).