[DRE-commits] [SCM] sup-mail.git branch, master, updated. debian/0.12.1-1-19-g39c5d26

[Per Andersson]

The following commit has been merged in the master branch:
commit 39c5d26a8e918c498f178b98dd5fff1c47335c3b
Author: Per Andersson <avtobiff at gmail.com>
Date:   Sat May 26 00:45:33 2012 +0200

    Patch: Avoid crash when (maybe) wrapping text.
    
    This patch fixes the crashes that occur when expanding GPG signatures.

diff --git a/debian/patches/0004-Avoid-crash-when-maybe-wrapping-text.patch b/debian/patches/0004-Avoid-crash-when-maybe-wrapping-text.patch
new file mode 100644
index 0000000..06b7a37
--- /dev/null
+++ b/debian/patches/0004-Avoid-crash-when-maybe-wrapping-text.patch
@@ -0,0 +1,24 @@
+From: Per Andersson <avtobiff at gmail.com>
+Date: Sat, 26 May 2012 00:41:29 +0200
+Subject: Avoid crash when (maybe) wrapping text.
+
+Crash occurs for instance when expanding GPG signatures.
+---
+ lib/sup/modes/thread-view-mode.rb |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/lib/sup/modes/thread-view-mode.rb b/lib/sup/modes/thread-view-mode.rb
+index 9fcc45d..2a8a237 100644
+--- a/lib/sup/modes/thread-view-mode.rb
++++ b/lib/sup/modes/thread-view-mode.rb
+@@ -846,7 +846,8 @@ private
+       else
+         width = buffer.content_width
+       end
+-      lines = lines.map { |l| l.chomp.wrap width }.flatten
++      # sometimes l is nil, avoid crash when this happens
++      lines = lines.map { |l| l.chomp.wrap width unless l == nil }.flatten
+     end
+     return lines
+   end
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 4378afd..6150ef3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Patch-out-all-requires-of-rubygems.patch
 0002-Fix-support-for-gpgme-2.0.patch
 0003-Update-tests-so-they-all-pass.patch
+0004-Avoid-crash-when-maybe-wrapping-text.patch

-- 
sup-mail.git