[mailx] - resolves: #805410 fixed SIGSEGV crash in which_protocol() function

[pschiffe]

commit d6ea4a3c3d2eb3ef5d0c5847132d60973fae85b1
Author: Peter Schiffer <pschiffe at redhat.com>
Date:   Thu Nov 1 16:07:11 2012 +0100

    - resolves: #805410
      fixed SIGSEGV crash in which_protocol() function

 mailx-12.5-fname-null.patch |   12 ++++++++++++
 mailx.spec                  |    7 ++++++-
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/mailx-12.5-fname-null.patch b/mailx-12.5-fname-null.patch
new file mode 100644
index 0000000..056e97f
--- /dev/null
+++ b/mailx-12.5-fname-null.patch
@@ -0,0 +1,12 @@
+diff -upr mailx-12.5.orig/names.c mailx-12.5/names.c
+--- mailx-12.5.orig/names.c	2006-03-04 01:32:16.000000000 +0100
++++ mailx-12.5/names.c	2012-11-01 15:28:43.883573793 +0100
+@@ -357,7 +357,7 @@ outof(struct name *names, FILE *fo, stru
+ 			free_child(pid);
+ 		} else {
+ 			int f;
+-			if ((fout = Zopen(fname, "a", NULL)) == NULL) {
++			if ((fname == NULL) || ((fout = Zopen(fname, "a", NULL)) == NULL)) {
+ 				perror(fname);
+ 				senderr++;
+ 				goto cant;
diff --git a/mailx.spec b/mailx.spec
index 1d6732d..f9c0b90 100644
--- a/mailx.spec
+++ b/mailx.spec
@@ -16,6 +16,8 @@ Source: mailx-%{version}.tar.xz
 Patch0: nail-11.25-config.patch
 Patch1: mailx-12.3-pager.patch
 Patch2: mailx-12.5-lzw.patch
+# resolves: #805410
+Patch3: mailx-12.5-fname-null.patch
 
 %if %{use_nss}
 BuildRequires: nss-devel, pkgconfig, krb5-devel
@@ -49,6 +51,7 @@ as well as "nail" (the initial name of this project).
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 sed -i 's,/etc/nail.rc,%{mailrc},g' mailx.1
 
 %build
@@ -118,8 +121,10 @@ popd
 %{_mandir}/*/*
 
 %changelog
-* Fri Oct 26 2012 Peter Schiffer <pschiffe at redhat.com> - 12.5-7
+* Thu Nov  1 2012 Peter Schiffer <pschiffe at redhat.com> - 12.5-7
 - cleaned .spec file
+- resolves: #805410
+  fixed SIGSEGV crash in which_protocol() function
 
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 12.5-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild