Commit 971a04f1 authored by Russ Cox's avatar Russ Cox

implications of len spec change

R=r
CC=golang-dev
https://golang.org/cl/1712048
parent 88f5bd94
...@@ -58,7 +58,7 @@ func (file *File) Readdirnames(count int) (names []string, err Error) { ...@@ -58,7 +58,7 @@ func (file *File) Readdirnames(count int) (names []string, err Error) {
if dirent.Ino == 0 { // File absent in directory. if dirent.Ino == 0 { // File absent in directory.
continue continue
} }
bytes := (*[len(dirent.Name)]byte)(unsafe.Pointer(&dirent.Name[0])) bytes := (*[10000]byte)(unsafe.Pointer(&dirent.Name[0]))
var name = string(bytes[0:dirent.Namlen]) var name = string(bytes[0:dirent.Namlen])
if name == "." || name == ".." { // Useless names if name == "." || name == ".." { // Useless names
continue continue
......
...@@ -53,7 +53,7 @@ func (file *File) Readdirnames(count int) (names []string, err Error) { ...@@ -53,7 +53,7 @@ func (file *File) Readdirnames(count int) (names []string, err Error) {
if dirent.Fileno == 0 { // File absent in directory. if dirent.Fileno == 0 { // File absent in directory.
continue continue
} }
bytes := (*[len(dirent.Name)]byte)(unsafe.Pointer(&dirent.Name[0])) bytes := (*[10000]byte)(unsafe.Pointer(&dirent.Name[0]))
var name = string(bytes[0:dirent.Namlen]) var name = string(bytes[0:dirent.Namlen])
if name == "." || name == ".." { // Useless names if name == "." || name == ".." { // Useless names
continue continue
......
...@@ -56,7 +56,7 @@ func (file *File) Readdirnames(count int) (names []string, err Error) { ...@@ -56,7 +56,7 @@ func (file *File) Readdirnames(count int) (names []string, err Error) {
if dirent.Ino == 0 { // File absent in directory. if dirent.Ino == 0 { // File absent in directory.
continue continue
} }
bytes := (*[len(dirent.Name)]byte)(unsafe.Pointer(&dirent.Name[0])) bytes := (*[10000]byte)(unsafe.Pointer(&dirent.Name[0]))
var name = string(bytes[0:clen(bytes[0:])]) var name = string(bytes[0:clen(bytes[0:])])
if name == "." || name == ".." { // Useless names if name == "." || name == ".." { // Useless names
continue continue
......
...@@ -56,7 +56,7 @@ func (file *File) Readdirnames(count int) (names []string, err Error) { ...@@ -56,7 +56,7 @@ func (file *File) Readdirnames(count int) (names []string, err Error) {
if dirent.Ino == 0 { // File absent in directory. if dirent.Ino == 0 { // File absent in directory.
continue continue
} }
bytes := (*[len(dirent.Name)]byte)(unsafe.Pointer(&dirent.Name[0])) bytes := (*[10000]byte)(unsafe.Pointer(&dirent.Name[0]))
var name = string(bytes[0:clen(bytes)]) var name = string(bytes[0:clen(bytes)])
if name == "." || name == ".." { // Useless names if name == "." || name == ".." { // Useless names
continue continue
......
...@@ -239,8 +239,8 @@ func anyToSockaddr(rsa *RawSockaddrAny) (Sockaddr, int) { ...@@ -239,8 +239,8 @@ func anyToSockaddr(rsa *RawSockaddrAny) (Sockaddr, int) {
break break
} }
} }
bytes := (*[len(pp.Path)]byte)(unsafe.Pointer(&pp.Path[0])) bytes := (*[10000]byte)(unsafe.Pointer(&pp.Path[0]))[0:n]
sa.Name = string(bytes[0:n]) sa.Name = string(bytes)
return sa, 0 return sa, 0
case AF_INET: case AF_INET:
......
...@@ -284,8 +284,8 @@ func anyToSockaddr(rsa *RawSockaddrAny) (Sockaddr, int) { ...@@ -284,8 +284,8 @@ func anyToSockaddr(rsa *RawSockaddrAny) (Sockaddr, int) {
for n < len(pp.Path) && pp.Path[n] != 0 { for n < len(pp.Path) && pp.Path[n] != 0 {
n++ n++
} }
bytes := (*[len(pp.Path)]byte)(unsafe.Pointer(&pp.Path[0])) bytes := (*[10000]byte)(unsafe.Pointer(&pp.Path[0]))[0:n]
sa.Name = string(bytes[0:n]) sa.Name = string(bytes)
return sa, 0 return sa, 0
case AF_INET: case AF_INET:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment