rpms/mutt
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Fixed a segmentation fault while parsing the certificates file

Browse Source 
(rhbz#750929)
This commit is contained in:
Honza Horák 2011-12-07 14:24:59 +01:00
parent a20328b0d8
commit 017b5aab8d
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
mutt-1.5.21-certscomp.patch Normal file
View File

@ -0,0 +1,21 @@
diff -up mutt-1.5.21/mutt_ssl_gnutls.c.debug mutt-1.5.21/mutt_ssl_gnutls.c
--- mutt-1.5.21/mutt_ssl_gnutls.c.debug 2011-11-03 15:56:29.992235238 +0100
+++ mutt-1.5.21/mutt_ssl_gnutls.c 2011-11-03 16:23:42.960123578 +0100
@@ -434,9 +434,16 @@ static int tls_compare_certificates (con
return 0;
}
- ptr = (unsigned char *)strstr((char*)b64_data.data, CERT_SEP) + 1;
- ptr = (unsigned char *)strstr((char*)ptr, CERT_SEP);
+ ptr = (unsigned char *)memmem((char*)b64_data.data, b64_data.size, CERT_SEP, sizeof(CERT_SEP));
+ if (ptr == NULL)
+ {
+ gnutls_free(cert.data);
+ FREE (&b64_data_data);
+ return 0;
+ }
+ ptr += 1;
+ ptr = (unsigned char *)memmem((char*)ptr, b64_data.size - (ptr - b64_data.data), CERT_SEP, sizeof(CERT_SEP));
b64_data.size = b64_data.size - (ptr - b64_data.data);
b64_data.data = ptr;

8
mutt.spec
View File

@ -16,7 +16,7 @@
Summary: A text mode mail user agent Summary: A text mode mail user agent
Name: mutt Name: mutt
Version: 1.5.21 Version: 1.5.21
Release: 8%{?dist} Release: 9%{?dist}
Epoch: 5 Epoch: 5
# The entire source code is GPLv2+ except # The entire source code is GPLv2+ except
# pgpewrap.c setenv.c sha1.c wcwidth.c which are Public Domain # pgpewrap.c setenv.c sha1.c wcwidth.c which are Public Domain
@ -33,6 +33,7 @@ Patch7: mutt-1.5.21-testcert.patch
Patch8: mutt-1.5.21-cabundle.patch Patch8: mutt-1.5.21-cabundle.patch
Patch9: mutt-1.5.21-gpgme-1.2.0.patch Patch9: mutt-1.5.21-gpgme-1.2.0.patch
Patch10: mutt-1.5.21-pophash.patch Patch10: mutt-1.5.21-pophash.patch
Patch11: mutt-1.5.21-certscomp.patch
Url: http://www.mutt.org/ Url: http://www.mutt.org/
Requires: mailcap urlview Requires: mailcap urlview
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -78,6 +79,7 @@ for selecting groups of messages.
%patch8 -p1 -b .cabundle %patch8 -p1 -b .cabundle
%patch9 -p1 -b .gpgme-1.2.0 %patch9 -p1 -b .gpgme-1.2.0
%patch10 -p1 -b .pophash %patch10 -p1 -b .pophash
%patch11 -p1 -b .certscomp
sed -i.gpgerror 's/`$GPGME_CONFIG --libs`/"\0 -lgpg-error"/' configure sed -i.gpgerror 's/`$GPGME_CONFIG --libs`/"\0 -lgpg-error"/' configure
@ -160,6 +162,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man5/muttrc.* %{_mandir}/man5/muttrc.*
%changelog %changelog
* Wed Dec 07 2011 Honza Horak <hhorak@redhat.com> - 5:1.5.21-9
- Fixed a segmentation fault while parsing the certificates file
(rhbz#750929)
* Wed Nov 02 2011 Honza Horak <hhorak@redhat.com> - 5:1.5.21-8 * Wed Nov 02 2011 Honza Horak <hhorak@redhat.com> - 5:1.5.21-8
- Removed ca-bundle.crt since it is outdated (rhbz#734379) - Removed ca-bundle.crt since it is outdated (rhbz#734379)
- Build with gpgme support by default (rhbz#748337) - Build with gpgme support by default (rhbz#748337)