[slrn/f16] Fix NULL pointer dereference in rline_update call-backs

[Petr Pisar]

commit 02830357261dcf3f020b21264c211543617cc6ef
Author: Petr Písař <ppisar at redhat.com>
Date:   Tue Jan 8 15:38:23 2013 +0100

    Fix NULL pointer dereference in rline_update call-backs

 ...inter-dereference-in-rline_update-call-ba.patch |   43 ++++++++++++++++++++
 slrn.spec                                          |    8 +++-
 2 files changed, 50 insertions(+), 1 deletions(-)
---
diff --git a/slrn-0.9.9p1-Fix-NULL-pointer-dereference-in-rline_update-call-ba.patch b/slrn-0.9.9p1-Fix-NULL-pointer-dereference-in-rline_update-call-ba.patch
new file mode 100644
index 0000000..ccc6e0c
--- /dev/null
+++ b/slrn-0.9.9p1-Fix-NULL-pointer-dereference-in-rline_update-call-ba.patch
@@ -0,0 +1,43 @@
+From a34542862383531ee465dcf9e5d63ea7e5894261 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Tue, 8 Jan 2013 15:33:34 +0100
+Subject: [PATCH] Fix NULL pointer dereference in rline_update call-backs
+
+Ported from upstream commit:
+
+commit 21fee1da0b829558d92fa1f7d7eceba22dbd5804
+Author: John E. Davis <davis at space.mit.edu>
+Date:   Mon Jul 25 15:49:02 2011 -0400
+
+    slrn pre1.0.0 change 27: Avoid prompt==NULL deref in rline_update.
+
+See <https://bugzilla.redhat.com/show_bug.cgi?id=847706>.
+---
+ src/misc.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/misc.c b/src/misc.c
+index f271577..c6c1e09 100644
+--- a/src/misc.c
++++ b/src/misc.c
+@@ -1550,6 +1550,8 @@ static void rline_update (SLrline_Type *rli, char *prompt,
+    (void) rli;
+ 
+    slrn_push_suspension (0);
++   if (prompt == NULL)
++     prompt = "";
+    
+    prompt_len = strlen (prompt);
+    ubuf = slrn_safe_malloc (prompt_len + len + 1);
+@@ -2080,6 +2082,8 @@ static int generic_read_input (char *prompt, char *dfl, char *str, int trim_flag
+    
+    Slrn_Full_Screen_Update = 1;
+    
++   if (prompt == NULL) prompt = "";
++
+    slrn_strncpy (prompt_buf, prompt, sizeof (prompt_buf));
+    len = strlen (prompt);
+    
+-- 
+1.7.11.7
+
diff --git a/slrn.spec b/slrn.spec
index 711fa52..1d08542 100644
--- a/slrn.spec
+++ b/slrn.spec
@@ -1,7 +1,7 @@
 Summary: A threaded Internet news reader
 Name: slrn
 Version: 0.9.9p1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
@@ -10,6 +10,8 @@ Source2: slrnpull.log
 Source4: README.rpm-slrnpull
 Patch1: slrn-0.9.9pre108-makefile.patch
 Patch2: slrn-0.9.9pre108-sendmail.patch
+# In upstream 1.0.0, bug #847706
+Patch3: slrn-0.9.9p1-Fix-NULL-pointer-dereference-in-rline_update-call-ba.patch
 BuildRequires: nss-devel nss_compat_ossl-devel slang-devel
 BuildRequires: inews
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -36,6 +38,7 @@ the slrnpull utility.
 %setup -q
 %patch1 -p1 -b .makefile
 %patch2 -p1 -b .sendmail
+%patch3 -p1 -b .rlineupdate
 
 for i in changes.txt; do
   iconv -f iso8859-1 -t utf8 -o ${i}{_,} && touch -r ${i}{,_} && mv -f ${i}{_,}
@@ -99,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/slrnpull.1*
 
 %changelog
+* Tue Jan 08 2013 Petr Pisar <ppisar at redhat.com> - 0.9.9p1-5
+- Fix NULL pointer dereference in rline_update call-backs (bug #847706)
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.9p1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild