Attachment 11426 Details for Bug 11495 – git-am fix for master.

[patch] git-am fix for master.

0001-Fix-gcc-f-fsanitize-address-error.patch (text/plain), 1.08 KB, created by Jeremy Allison on 2015-09-10 17:44:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2015-09-10 17:44:02 UTC

Size: 1.08 KB

patch

obsolete

>From 3e351b3c90acd7d52a706a183e098f13cf5c2ea6 Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Thu, 10 Sep 2015 10:40:32 -0700
>Subject: [PATCH] Fix gcc -f-fsanitize=address error.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=11495
>
>Signed-off-by: Jeremy Allison <jra@samba.org>
>---
> source3/libsmb/nmblib.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
>diff --git a/source3/libsmb/nmblib.c b/source3/libsmb/nmblib.c
>index 8feb029..ccd2ac3 100644
>--- a/source3/libsmb/nmblib.c
>+++ b/source3/libsmb/nmblib.c
>@@ -212,7 +212,6 @@ static int parse_nmb_name(char *inbuf,int ofs,int length, struct nmb_name *name)
> 		name->name[n++] = (c1<<4) | c2;
> 		m -= 2;
> 	}
>-	name->name[n] = 0;
> 
> 	if (n==MAX_NETBIOSNAME_LEN) {
> 		/* parse out the name type, its always
>@@ -224,8 +223,11 @@ static int parse_nmb_name(char *inbuf,int ofs,int length, struct nmb_name *name)
> 		n = 14;
> 		while (n && name->name[n]==' ')
> 			name->name[n--] = 0;
>+	} else {
>+		name->name[n] = 0;
> 	}
> 
>+
> 	/* now the domain parts (if any) */
> 	n = 0;
> 	while (ubuf[offset]) {
>-- 
>2.6.0.rc0.131.gf624c3d
>

Actions: View

Attachments on bug 11495: 11426 | 11433 | 14778