[ninja] fixed "[abrt] ninja: vsnprintf(): ninja-1.5.8.1 killed by SIGSEGV" (#1161287)

[Adrian Reber]

commit 52dde88127615132ed7175c04678faf8893949d4
Author: Adrian Reber <adrian at lisas.de>
Date:   Thu Nov 20 17:44:36 2014 +0100

    fixed "[abrt] ninja: vsnprintf(): ninja-1.5.8.1 killed by SIGSEGV" (#1161287)

 broken-signal-handler.patch |   14 ++++++++++++++
 ninja.spec                  |    7 ++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/broken-signal-handler.patch b/broken-signal-handler.patch
new file mode 100644
index 0000000..0ac5a6b
--- /dev/null
+++ b/broken-signal-handler.patch
@@ -0,0 +1,14 @@
+--- a/source/irc.c	2014-11-20 17:36:23.833395035 +0100
++++ b/source/irc.c	2014-11-20 17:38:51.856400553 +0100
+@@ -347,7 +347,10 @@
+    irc_own_signoff(reason);
+ #endif   
+ 
+-   irc_cleanup(reason);
++   /* if called from the signal handler the reason is no string
++    * but the actual signal; just ignore the cleanup in this case */
++   if ((long)reason >= 31)
++     irc_cleanup(reason);
+ 
+ #ifdef _Windows
+    DestroyWindow(hwndMain);
diff --git a/ninja.spec b/ninja.spec
index 3cfbeb6..c1e040a 100644
--- a/ninja.spec
+++ b/ninja.spec
@@ -1,6 +1,6 @@
 Name: ninja
 Version: 1.5.8.1
-Release: 18
+Release: 19
 License: GPLv2+
 Summary: Text based Internet Relay Chat (IRC) client
 Group: Applications/Internet
@@ -9,6 +9,7 @@ Source0: http://qoop.org/ftp/ninja/sources/%{name}-%{version}.tar.gz
 Patch0: %{name}-%{version}-doc.patch
 Patch1: %{name}-%{version}-build.patch
 Patch2: ninja.signal-11-718920.patch
+Patch3: broken-signal-handler.patch
 BuildRequires: ncurses-devel
 
 %description
@@ -28,6 +29,7 @@ irc channels.  Especially if you want to have power features.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %configure
@@ -59,6 +61,9 @@ rm %{buildroot}/%{_datadir}/%{name}/help/.date
 %doc README ChangeLog BUGS+TODO COPYING
 
 %changelog
+* Thu Nov 20 2014 Adrian Reber <adrian at lisas.de> - 1.5.8.1-19
+- fixed "[abrt] ninja: vsnprintf(): ninja-1.5.8.1 killed by SIGSEGV" (#1161287)
+
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.8.1-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild