- Add patch for GNOME bug #373146 (spam message triggers crash).

This commit is contained in:
Matthew Barnes 2007-05-08 17:10:23 +00:00
parent 41814624b6
commit 08ab64d257
2 changed files with 22 additions and 1 deletions

View File

@ -0,0 +1,14 @@
--- evolution-data-server-1.10.1/camel/camel-folder-summary.c.camel-folder-summary-crash 2007-05-02 12:46:07.000000000 -0400
+++ evolution-data-server-1.10.1/camel/camel-folder-summary.c 2007-05-02 12:47:34.000000000 -0400
@@ -2952,7 +2952,10 @@
camel_message_info_ptr(const CamelMessageInfo *mi, int id)
{
if (mi->summary)
- return ((CamelFolderSummaryClass *)((CamelObject *)mi->summary)->klass)->info_ptr(mi, id);
+ if (((CamelFolderSummaryClass *)((CamelObject *)mi->summary)->klass)->info_ptr)
+ return ((CamelFolderSummaryClass *)((CamelObject *)mi->summary)->klass)->info_ptr(mi, id);
+ else
+ return info_ptr(mi, id);
else
return info_ptr(mi, id);
}

View File

@ -26,7 +26,7 @@
Name: evolution-data-server
Version: 1.10.1
Release: 4%{?dist}
Release: 5%{?dist}
License: LGPL
Group: System Environment/Libraries
Summary: Backend data server for Evolution
@ -84,6 +84,9 @@ Patch24: evolution-data-server-1.10.1-apop-auth-vulnerability.patch
# Fix a dangling pointer (no bug number).
Patch25: evolution-data-server-1.10.1-e-source-group.patch
# GNOME bug #373146
Patch26: evolution-data-server-1.10.1-camel-folder-summary-crash.patch
### Dependencies ###
Requires: GConf2
@ -179,6 +182,7 @@ evolution-data-server.
%patch23 -p1 -b .code-cleanup
%patch24 -p1 -b .apop-auth-vulnerability
%patch25 -p1 -b .e-source-group
%patch26 -p1 -b .camel-folder-symmary-crash
mkdir -p krb5-fakeprefix/include
mkdir -p krb5-fakeprefix/lib
@ -396,6 +400,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
%changelog
* Tue May 08 2007 Matthew Barnes <mbarnes@redhat.com> - 1.10.1-5.fc7
- Add patch for GNOME bug #373146 (spam message triggers crash).
* Mon May 07 2007 Matthew Barnes <mbarnes@redhat.com> - 1.10.1-4.fc7
- Add patch to fix a dangling pointer in e-source-group.c.