Commita580f88

committed

[release-branch.go1] crypto/rand: zero length reads shouldn't crash on Windows.

««« backport a69e30463bf4crypto/rand: zero length reads shouldn't crash on Windows.R=golang-dev, daveCC=golang-devhttps://golang.org/cl/6496099»»»

1 parent0dabae4 commita580f88Copy full SHA for a580f88

File tree

+15

-0

lines changed

+15

-0

lines changed

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,3 +29,14 @@ func TestRead(t *testing.T) {`
`29`	`29`	`t.Fatalf("Compressed %d -> %d",len(b),z.Len())`
`30`	`30`	`}`
`31`	`31`	`}`
	`32`	`+`
	`33`	`+funcTestReadEmpty(t*testing.T) {`
	`34`	`+n,err:=Reader.Read(make([]byte,0))`
	`35`	`+ifn!=0\|\|err!=nil {`
	`36`	`+t.Fatalf("Read(make([]byte, 0)) = %d, %v",n,err)`
	`37`	`+}`
	`38`	`+n,err=Reader.Read(nil)`
	`39`	`+ifn!=0\|\|err!=nil {`
	`40`	`+t.Fatalf("Read(make(nil) = %d, %v",n,err)`
	`41`	`+}`
	`42`	`+}`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,10 @@ func (r *rngReader) Read(b []byte) (n int, err error) {`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`	`r.mu.Unlock()`
	`38`	`+`
	`39`	`+iflen(b)==0 {`
	`40`	`+return0,nil`
	`41`	`+}`
`38`	`42`	`err=syscall.CryptGenRandom(r.prov,uint32(len(b)),&b[0])`
`39`	`43`	`iferr!=nil {`
`40`	`44`	`return0,os.NewSyscallError("CryptGenRandom",err)`

Comments

(0)