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

[pschiffe]

commit 546042df63bcfa73a3e9fde28a713891580b2ca7
Author: Peter Schiffer <pschiffe at redhat.com>
Date:   Thu Nov 8 18:31:53 2012 +0100

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

 mailx-12.5-fname-null.patch |   12 ++++++++++++
 mailx.spec                  |    9 ++++++++-
 2 files changed, 20 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 8442866..c9a5fa3 100644
--- a/mailx.spec
+++ b/mailx.spec
@@ -4,7 +4,7 @@
 Summary: Enhanced implementation of the mailx command
 Name: mailx
 Version: 12.5
-Release: 5%{?dist}
+Release: 6%{?dist}
 Group: 	Applications/Internet
 # mailx-12.4/nsserr.c, mailx-12.4/nss.c  have MPLv1.1 license 
 # other files are BSD 
@@ -36,6 +36,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 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
@@ -71,6 +73,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
 
@@ -155,6 +158,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Nov  8 2012 Peter Schiffer <pschiffe at redhat.com> - 12.5-6
+- resolves: #805410
+  fixed SIGSEGV crash in which_protocol() function
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 12.5-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild