From 830dd05dca5119e8e89c14c2ab18717be7d53804 Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Thu, 18 Apr 2013 12:59:24 +0000
Subject: [PATCH] .

OBS-URL: https://build.opensuse.org/package/show/server:mail/mutt?expand=0&rev=90
---
 mutt.changes         |  6 ++++++
 mutt.spec            |  3 +++
 widechar.sidebar.dif | 22 ++++++++++++++++++++++
 3 files changed, 31 insertions(+)
 create mode 100644 widechar.sidebar.dif

diff --git a/mutt.changes b/mutt.changes
index 087a6f4..dd848b9 100644
--- a/mutt.changes
+++ b/mutt.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Apr 18 12:54:39 UTC 2013 - werner@suse.de
+
+- Add widechar.sidebar.dif: bnc#813498 - mutt crashes in fgetwc in
+  text_enriched_handler
+
 -------------------------------------------------------------------
 Mon Jan 14 09:11:05 UTC 2013 - werner@suse.de
 
diff --git a/mutt.spec b/mutt.spec
index e2f093c..4970356 100644
--- a/mutt.spec
+++ b/mutt.spec
@@ -92,6 +92,8 @@ Patch11:        aw.listreply.diff
 Patch12:        patch-1.5.21.vk.pgp_verbose_mime
 Patch13:        automake-1.12.patch
 Patch14:        nion.sidebar-color.diff
+# PATCH-FIX-OPENSUSE: bnc#813498 - mutt crashes in fgetwc in text_enriched_handler
+Patch15:        widechar.sidebar.dif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %global         _sysconfdir %{_sysconfdir}
 
@@ -122,6 +124,7 @@ done
 %patch12 -p1 -b .pgp_verbose_mtime
 %patch13 -p1 -b .automake-1.12
 %patch14 -p1 -b .sidebar.color
+%patch15 -p0 -b .widechar.sidebar
 
 cp doc/Muttrc Muttrc.SuSE
 cp %{S:2} .
diff --git a/widechar.sidebar.dif b/widechar.sidebar.dif
new file mode 100644
index 0000000..ec4bc99
--- /dev/null
+++ b/widechar.sidebar.dif
@@ -0,0 +1,22 @@
+--- handler.c
++++ handler.c	2013-04-18 12:51:41.414000078 +0000
+@@ -1650,7 +1650,7 @@ int mutt_body_handler (BODY *b, STATE *s
+ 	/* decode to a tempfile, saving the original destination */
+ 	fp = s->fpout;
+ #ifdef HAVE_FMEMOPEN
+-	if ((s->fpout = open_memstream(&temp, &tempsize)) == NULL)
++	if ((s->fpout = open_wmemstream(&temp, &tempsize)) == NULL)
+ 	{
+ 	  mutt_error _("Unable to open memory stream!");
+ 	  dprint (1, (debugfile, "Can't open memory stream.\n"));
+--- pattern.c
++++ pattern.c	2013-04-18 12:52:06.573939217 +0000
+@@ -168,7 +168,7 @@ msg_search (CONTEXT *ctx, pattern_t* pat
+       s.fpin = msg->fp;
+       s.flags = M_CHARCONV;
+ #ifdef HAVE_FMEMOPEN
+-      if((s.fpout = open_memstream(&temp, &tempsize)) == NULL)
++      if((s.fpout = open_wmemstream(&temp, &tempsize)) == NULL)
+       {
+ 	mutt_perror ("Error opening memstream");
+ 	return (0);