From 58dc6c781fe54b6cee5e95b85cecaddce760e7e0 Mon Sep 17 00:00:00 2001 From: Antonio Radici Date: Sat, 5 Sep 2009 17:24:05 +0100 Subject: [PATCH] upstream/537818-emptycharset.patch: handling empty charsets without segfaulting (Closes: 537818) --- debian/changelog | 2 ++ debian/patches/series | 1 + debian/patches/upstream/537818-emptycharset.patch | 12 ++++++++++++ 3 files changed, 15 insertions(+) create mode 100644 debian/patches/upstream/537818-emptycharset.patch diff --git a/debian/changelog b/debian/changelog index db2f188..8ae86a5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ mutt (1.5.20-3) UNRELEASED; urgency=low * debian/patches/series; + upstream/538128-mh-folder-access.patch: MH dirs are now correctly parsed (Closes: 538128) + + upstream/537818-emptycharset.patch: handling empty charsets without + segfaulting (Closes: 537818) -- Antonio Radici Sat, 15 Aug 2009 00:32:49 +0100 diff --git a/debian/patches/series b/debian/patches/series index cc959d0..9d5b9df 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -37,6 +37,7 @@ upstream/534543-imap-port.patch # the following two patches are also in upstream hg repo # plese drop them if there is a new release upstream/538128-mh-folder-access.patch +upstream/537818-emptycharset.patch misc/hyphen-as-minus.patch #misc/manpage-typos.patch misc/smime_keys-manpage.patch diff --git a/debian/patches/upstream/537818-emptycharset.patch b/debian/patches/upstream/537818-emptycharset.patch new file mode 100644 index 0000000..10fb5d8 --- /dev/null +++ b/debian/patches/upstream/537818-emptycharset.patch @@ -0,0 +1,12 @@ +--- a/init.c ++++ b/init.c +@@ -1751,6 +1751,9 @@ + char *p, *q = NULL, *s = safe_strdup (val); + int rc = 0, strict = strcmp (opt->option, "send_charset") == 0; + ++ if (!s) ++ return rc; ++ + for (p = strtok_r (s, ":", &q); p; p = strtok_r (NULL, ":", &q)) + { + if (!*p) -- 2.43.0