Attachment 1210565 Details for Bug 1384968 – Patch

[patch] Patch

no_cmantool_qdisk_segfault.patch (text/plain), 1.08 KB, created by Christine Caulfield on 2016-10-14 14:26:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christine Caulfield

Created: 2016-10-14 14:26:48 UTC

Size: 1.08 KB

patch

obsolete

>diff --git a/cman/cman_tool/main.c b/cman/cman_tool/main.c
>index 958c35b..3d7f4e5 100644
>--- a/cman/cman_tool/main.c
>+++ b/cman/cman_tool/main.c
>@@ -402,19 +402,23 @@ static void print_node(commandline_t *comline, cman_handle_t h, int *format, str
> 	}
> 
> 	if (comline->addresses_opt || comline->format_opts) {
>-		if (!cman_get_node_addrs(h, node->cn_nodeid, MAX_INTERFACES, &numaddrs, addrs) &&
>-		    numaddrs)
>-		{
>-			if (!comline->format_opts) {
>-				printf("       Addresses: ");
>-				for (i = 0; i < numaddrs; i++)
>-				{
>-					print_address(addrs[i].cna_address);
>-					printf(" ");
>+		if (node->cn_nodeid > 0) {
>+			if (!cman_get_node_addrs(h, node->cn_nodeid, MAX_INTERFACES, &numaddrs, addrs) &&
>+			    numaddrs) {
>+				if (!comline->format_opts) {
>+					printf("       Addresses: ");
>+					for (i = 0; i < numaddrs; i++)
>+					{
>+						print_address(addrs[i].cna_address);
>+						printf(" ");
>+					}
>+					printf("\n");
> 				}
>-				printf("\n");
> 			}
> 		}
>+		else {
>+			printf("0.0.0.0");
>+		}
> 	}
> 
> 	if (comline->format_opts && (cman_get_node_extra(h, node->cn_nodeid, &enode) == 0)) {

Actions: View | Diff

Attachments on bug 1384968: 1210565 | 1219675