diff --git a/cups-lspp.patch b/cups-lspp.patch index 87b26df..9f5f392 100644 --- a/cups-lspp.patch +++ b/cups-lspp.patch @@ -1430,13 +1430,13 @@ + userfooter = strdup(attr->values[1].string.text); + + 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 + */ + free(userheader); -+ free(userfooter); ++ if (userfooter) free(userfooter); + userheader = userfooter = NULL; + } + } diff --git a/cups.spec b/cups.spec index 37158c7..ccd312e 100644 --- a/cups.spec +++ b/cups.spec @@ -6,7 +6,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.2.2 -Release: 14 +Release: 15 License: GPL Group: System Environment/Daemons 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 %changelog +* Thu Aug 24 2006 Tim Waugh 1:1.2.2-15 +- Fixed LSPP patch passing NULL to strcmp (bug #203784). + * Mon Aug 21 2006 Tim Waugh 1:1.2.2-14 - Updated LSPP patch (bug #203376).