Don't crash when MIME database could not be loaded (bug #610088).
This commit is contained in:
parent
91b2885d0a
commit
eeb957badf
15
cups-autotype-crash.patch
Normal file
15
cups-autotype-crash.patch
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
diff -up cups-1.4.4/scheduler/ipp.c.autotype-crash cups-1.4.4/scheduler/ipp.c
|
||||||
|
--- cups-1.4.4/scheduler/ipp.c.autotype-crash 2010-10-15 15:25:15.093421917 +0100
|
||||||
|
+++ cups-1.4.4/scheduler/ipp.c 2010-10-15 15:25:49.645296947 +0100
|
||||||
|
@@ -10481,8 +10481,9 @@ send_document(cupsd_client_t *con, /* I
|
||||||
|
if (!filetype)
|
||||||
|
filetype = mimeType(MimeDatabase, super, type);
|
||||||
|
|
||||||
|
- cupsdLogJob(job, CUPSD_LOG_DEBUG, "Request file type is %s/%s.",
|
||||||
|
- filetype->super, filetype->type);
|
||||||
|
+ if (filetype)
|
||||||
|
+ cupsdLogJob(job, CUPSD_LOG_DEBUG, "Request file type is %s/%s.",
|
||||||
|
+ filetype->super, filetype->type);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
filetype = mimeType(MimeDatabase, super, type);
|
@ -8,7 +8,7 @@
|
|||||||
Summary: Common Unix Printing System
|
Summary: Common Unix Printing System
|
||||||
Name: cups
|
Name: cups
|
||||||
Version: 1.4.4
|
Version: 1.4.4
|
||||||
Release: 9%{?dist}
|
Release: 10%{?dist}
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
Group: System Environment/Daemons
|
Group: System Environment/Daemons
|
||||||
Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
|
Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
|
||||||
@ -70,6 +70,7 @@ Patch35: cups-dnssd-deviceid.patch
|
|||||||
Patch36: cups-ricoh-deviceid-oid.patch
|
Patch36: cups-ricoh-deviceid-oid.patch
|
||||||
Patch37: cups-texttops-rotate-page.patch
|
Patch37: cups-texttops-rotate-page.patch
|
||||||
Patch38: cups-str3608.patch
|
Patch38: cups-str3608.patch
|
||||||
|
Patch39: cups-autotype-crash.patch
|
||||||
|
|
||||||
Patch100: cups-lspp.patch
|
Patch100: cups-lspp.patch
|
||||||
|
|
||||||
@ -282,6 +283,8 @@ module.
|
|||||||
# Avoid empty notify-subscribed-event attributes (bug #606909, STR
|
# Avoid empty notify-subscribed-event attributes (bug #606909, STR
|
||||||
# #3608).
|
# #3608).
|
||||||
%patch38 -p1 -b .str3608
|
%patch38 -p1 -b .str3608
|
||||||
|
# Don't crash when MIME database could not be loaded (bug #610088).
|
||||||
|
%patch39 -p1 -b .autotype-crash
|
||||||
|
|
||||||
%if %lspp
|
%if %lspp
|
||||||
# LSPP support.
|
# LSPP support.
|
||||||
@ -585,6 +588,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{php_extdir}/phpcups.so
|
%{php_extdir}/phpcups.so
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Oct 15 2010 Tim Waugh <twaugh@redhat.com> 1:1.4.4-10
|
||||||
|
- Don't crash when MIME database could not be loaded (bug #610088).
|
||||||
|
|
||||||
* Fri Sep 17 2010 Tim Waugh <twaugh@redhat.com> 1:1.4.4-9
|
* Fri Sep 17 2010 Tim Waugh <twaugh@redhat.com> 1:1.4.4-9
|
||||||
- Perform locking for gnutls and avoid libgcrypt's broken
|
- Perform locking for gnutls and avoid libgcrypt's broken
|
||||||
locking (bug #607159).
|
locking (bug #607159).
|
||||||
|
Loading…
Reference in New Issue
Block a user