diff --git a/backport-crypt-gpgme-Fix-NULL-dereference.patch b/backport-crypt-gpgme-Fix-NULL-dereference.patch new file mode 100644 index 0000000..ad3965e --- /dev/null +++ b/backport-crypt-gpgme-Fix-NULL-dereference.patch @@ -0,0 +1,25 @@ +From 0af8a6fcdbe8550bababd51c4da1772c75f77912 Mon Sep 17 00:00:00 2001 +From: Alejandro Colomar +Date: Fri, 19 Apr 2024 22:30:54 +0200 +Subject: [PATCH] crypt-gpgme.c: Fix NULL dereference + +Fixes: 1afaa74a19ee ("gpgme integration. See documentation for $crypt_use_gpgme, and http://www.gnupg.org/aegypten2/.") +--- + crypt-gpgme.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/crypt-gpgme.c b/crypt-gpgme.c +index fdf44af4..5313d6f2 100644 +--- a/crypt-gpgme.c ++++ b/crypt-gpgme.c +@@ -2013,7 +2013,7 @@ restart: + gpgme_decrypt_result_t result; + + result = gpgme_op_decrypt_result (ctx); +- if (!result->unsupported_algorithm) ++ if (result && !result->unsupported_algorithm) + { + maybe_signed = 1; + gpgme_data_release (plaintext); +-- +GitLab \ No newline at end of file diff --git a/mutt.spec b/mutt.spec index cd7d1f7..d073859 100644 --- a/mutt.spec +++ b/mutt.spec @@ -1,6 +1,6 @@ Name: mutt Version: 2.2.12 -Release: 1 +Release: 2 Epoch: 5 Summary: Text-based mail client License: GPLv2+ and Public Domain @@ -16,6 +16,7 @@ Patch5: mutt-1.9.4-lynx_no_backscapes.patch Patch6: mutt-1.9.5-nodotlock.patch Patch7: mutt-1.10.0-muttrc.patch Patch8: mutt-1.12.1-optusegpgagent.patch +Patch9: backport-crypt-gpgme-Fix-NULL-dereference.patch BuildRequires: gcc ncurses-devel gettext automake /usr/bin/xsltproc BuildRequires: lynx docbook-style-xsl perl-interpreter perl-generators @@ -123,6 +124,9 @@ ln -sf ./muttrc.5 %{buildroot}%{_mandir}/man5/muttrc.local.5 %{_infodir}/mutt.info.* %changelog +* Wed Jul 31 2024 gaihuiying - 5:2.2.12-2 +- Fix NULL dereference in crypt gpgme + * Thu Sep 14 2023 yaoxin - 5:2.2.12-1 - Update to 2.2.12 for fix CVE-2023-4874 and CVE-2023-4875