upstream/537818-emptycharset.patch: handling empty charsets without segfaulting ...

diff --git a/debian/changelog b/debian/changelog
index db2f18828d68c8fe9ff19733076d6541cf15e250..8ae86a5dca0dc5e3a035e783298e949db308d420 100644 (file)
--- 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 <antonio@dyne.org>  Sat, 15 Aug 2009 00:32:49 +0100
 

diff --git a/debian/patches/series b/debian/patches/series
index cc959d0a4b349fd033378690ba731ed02fce4d4b..9d5b9dfe3eab7f04c32700c6ac7b17fe0948d3d7 100644 (file)
--- 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 (file)
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)