Attachment 640861 Details for Bug 830799 – 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), 1009 bytes, created by Jan Friesse on 2012-11-08 15:00:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Friesse

Created: 2012-11-08 15:00:41 UTC

Size: 1009 bytes

patch

obsolete

>From f3e72476e20a0a248fe2b032ba0efa6701e4b3ef Mon Sep 17 00:00:00 2001
>From: Jan Friesse <jfriesse@redhat.com>
>Date: Thu, 8 Nov 2012 13:17:09 +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>
>(backport from needle)
>---
> exec/totemsrp.c |    5 ++++-
> 1 files changed, 4 insertions(+), 1 deletions(-)
>
>diff --git a/exec/totemsrp.c b/exec/totemsrp.c
>index 9a1bb85..0c18493 100644
>--- a/exec/totemsrp.c
>+++ b/exec/totemsrp.c
>@@ -3368,7 +3368,10 @@ static unsigned int backlog_get (struct totemsrp_instance *instance)
> 		backlog = cs_queue_used (&instance->retrans_message_queue);
> 		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 830799: 591832 | 591833 | 591834 | 640856 | 640861 | 640862