cgo: accept null pointers in gccgo flavour of C.GoString.

R=golang-dev, rsc CC=golang-dev https://golang.org/cl/5569074
golang · Jan 27, 2012 · 21c65e8 · 21c65e8
1 parent 75397e6
commit 21c65e8
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/cmd/cgo/out.go b/src/cmd/cgo/out.go
@@ -786,7 +786,8 @@ const char *CString(struct __go_string s) {
 }
 
 struct __go_string GoString(char *p) {
-	return __go_byte_array_to_string(p, strlen(p));
+	int len = (p != NULL) ? strlen(p) : 0;
+	return __go_byte_array_to_string(p, len);
 }
 
 struct __go_string GoStringN(char *p, int n) {