From: Ian Lance Taylor <iant@golang.org>
Date: Tue, 18 Jan 2011 16:10:22 +0000 (-0800)
Subject: syscall: Correct length of GNU/Linux abstract Unix domain sockaddr.
X-Git-Tag: weekly.2011-01-19~49
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=2862d003cb052a672f34cca5125ff12628909fc2;p=gostls13.git

syscall: Correct length of GNU/Linux abstract Unix domain sockaddr.

R=rsc, iant2
CC=golang-dev
https://golang.org/cl/3974044
---

diff --git a/src/pkg/syscall/syscall_linux.go b/src/pkg/syscall/syscall_linux.go
index f7551c1056..d0f314c88b 100644
--- a/src/pkg/syscall/syscall_linux.go
+++ b/src/pkg/syscall/syscall_linux.go
@@ -253,12 +253,15 @@ func (sa *SockaddrUnix) sockaddr() (uintptr, _Socklen, int) {
 	for i := 0; i < n; i++ {
 		sa.raw.Path[i] = int8(name[i])
 	}
+	// length is family (uint16), name, NUL.
+	sl := 2 + _Socklen(n) + 1
 	if sa.raw.Path[0] == '@' {
 		sa.raw.Path[0] = 0
+		// Don't count trailing NUL for abstract address.
+		sl--
 	}
 
-	// length is family (uint16), name, NUL.
-	return uintptr(unsafe.Pointer(&sa.raw)), 2 + _Socklen(n) + 1, 0
+	return uintptr(unsafe.Pointer(&sa.raw)), sl, 0
 }
 
 type SockaddrLinklayer struct {