Attachment 674873 Details for Bug 847706 – Fix ported from upstream

[patch] Fix ported from upstream

slrn-0.9.9p1-Fix-NULL-pointer-dereference-in-rline_update-call-ba.patch (text/plain), 1.22 KB, created by Petr Pisar on 2013-01-08 14:40:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Petr Pisar

Created: 2013-01-08 14:40:50 UTC

Size: 1.22 KB

patch

obsolete

>From a34542862383531ee465dcf9e5d63ea7e5894261 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@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@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
>

Actions: View | Diff

Attachments on bug 847706: 603946 | 603947 | 674873