From: Peter Collingbourne <pcc@google.com>
Date: Sun, 27 Apr 2014 05:16:38 +0000 (-0700)
Subject: cmd/cgo: fix C.CString for strings containing null terminators under gccgo
X-Git-Tag: go1.3beta2~182
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=8cb916f71d7d397905b9d8a5a0ea5c22871ac867;p=gostls13.git

cmd/cgo: fix C.CString for strings containing null terminators under gccgo

Previously we used strndup(3) to implement C.CString for gccgo. This
is wrong because strndup assumes the string to be null terminated,
and stops at the first null terminator. Instead, use malloc
and memmove to create a copy of the string, as we do in the
gc implementation.

LGTM=iant
R=iant
CC=golang-codereviews
https://golang.org/cl/96790047
---

diff --git a/src/cmd/cgo/out.go b/src/cmd/cgo/out.go
index 0c32e4ca15..3f04f13611 100644
--- a/src/cmd/cgo/out.go
+++ b/src/cmd/cgo/out.go
@@ -1225,7 +1225,10 @@ struct __go_string __go_byte_array_to_string(const void* p, intgo len);
 struct __go_open_array __go_string_to_byte_array (struct __go_string str);
 
 const char *_cgoPREFIX_Cfunc_CString(struct __go_string s) {
-	return strndup((const char*)s.__data, s.__length);
+	char *p = malloc(s.__length+1);
+	memmove(p, s.__data, s.__length);
+	p[s.__length] = 0;
+	return p;
 }
 
 struct __go_string _cgoPREFIX_Cfunc_GoString(char *p) {