Attachment 640874 Details for Bug 820821 – Proposed patch - part 5 - Handle segfault in backlog_get

[patch] Proposed patch - part 5 - Handle segfault in backlog_get

2012-11-08-0002-Handle-segfault-in-backlog_get.patch (text/plain), 975 bytes, created by Jan Friesse on 2012-11-08 15:06:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Friesse

Created: 2012-11-08 15:06:04 UTC

Size: 975 bytes

patch

obsolete

>From 013ee01bb2e3b2cbfa59393e2a62fe9af0f1cd94 Mon Sep 17 00:00:00 2001
>From: Jan Friesse <jfriesse@redhat.com>
>Date: Wed, 7 Nov 2012 16:56:33 +0100
>Subject: [PATCH 2/3] Handle segfault in backlog_get
>
>If instance->memb_state is not OPERATION or RECOVERY, we was passing NULL
>to cs_queue_used call.
>
>Signed-off-by: Jan Friesse <jfriesse@redhat.com>
>---
> exec/totemsrp.c |    5 ++++-
> 1 files changed, 4 insertions(+), 1 deletions(-)
>
>diff --git a/exec/totemsrp.c b/exec/totemsrp.c
>index b0a0560..7fcee9b 100644
>--- a/exec/totemsrp.c
>+++ b/exec/totemsrp.c
>@@ -3414,7 +3414,10 @@ static unsigned int backlog_get (struct totemsrp_instance *instance)
> 	if (instance->memb_state == MEMB_STATE_RECOVERY) {
> 		queue_use = &instance->retrans_message_queue;
> 	}
>-	backlog = cs_queue_used (queue_use);
>+
>+	if (queue_use != NULL) {
>+		backlog = cs_queue_used (queue_use);
>+	}
> 
> 	instance->stats.token[instance->stats.latest_token].backlog_calc = backlog;
> 	return (backlog);
>-- 
>1.7.1
>

Actions: View | Diff

Attachments on bug 820821: 583724 | 584502 | 584503 | 584918 | 584944 | 589886 | 590918 | 591194 | 591509 | 591532 | 592063 | 593132 | 593133 | 640873 | 640874 | 640875