Attachment 14554 Details for Bug 13665 – git-am fix for 4.9.next.

[patch] git-am fix for 4.9.next.

0001-lib-socket-If-returning-early-set-ifaces.patch (text/plain), 1.56 KB, created by Jeremy Allison on 2018-10-31 20:06:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2018-10-31 20:06:13 UTC

Size: 1.56 KB

patch

obsolete

>From 353d3c26f3b870a9cd3f6e14433aa5fc3cd00ca7 Mon Sep 17 00:00:00 2001
>From: David Mulder <dmulder@suse.com>
>Date: Wed, 24 Oct 2018 10:55:02 -0600
>Subject: [PATCH] lib:socket: If returning early, set ifaces
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Prevents a segfault in load_interfaces() when total interfaces == 1.
>Fixes regression caused by da68a1b2f417ec82ea4ed3e7a4d867cef8ca8f93.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=13665
>
>Signed-off-by: David Mulder <dmulder@suse.com>
>Reviewed-by: Ralph BÃ¶hme <slow@samba.org>
>Reviewed-by: Volker Lendecke <vl@samba.org>
>Reviewed-by: Jeremy Allison <jra@samba.org>
>
>Autobuild-User(master): Volker Lendecke <vl@samba.org>
>Autobuild-Date(master): Sun Oct 28 00:35:35 CEST 2018 on sn-devel-144
>
>(cherry picked from commit 5391e21dea3168691cee1e6ef6c5959e46d62d1e)
>---
> lib/socket/interfaces.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
>diff --git a/lib/socket/interfaces.c b/lib/socket/interfaces.c
>index 168bff501c2..ac26b97c248 100644
>--- a/lib/socket/interfaces.c
>+++ b/lib/socket/interfaces.c
>@@ -363,12 +363,13 @@ static int iface_comp(struct iface_struct *i1, struct iface_struct *i2)
>    above */
> int get_interfaces(TALLOC_CTX *mem_ctx, struct iface_struct **pifaces)
> {
>-	struct iface_struct *ifaces;
>+	struct iface_struct *ifaces = NULL;
> 	int total, i, j;
> 
> 	total = _get_interfaces(mem_ctx, &ifaces);
> 	/* If we have an error, no interface or just one we can leave */
> 	if (total <= 1) {
>+		*pifaces = ifaces;
> 		return total;
> 	}
> 
>-- 
>2.19.1.568.g152ad8e336-goog
>

Flags:

slow: review+

Actions: View

Attachments on bug 13665: 14543 | 14554