cybercyst/go
1
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-05-05 15:43:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[release-branch.go1.13] all: merge release-branch.go1.13-security into release-branch.go1.13

Browse Source 
Change-Id: Ib8a4c5f58de71145525ba23562bf8a0c35b60c9c
This commit is contained in:
Katie Hockman 2020-08-06 13:10:42 -04:00
commit 2bc8d90fa2
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
go1.13.14 go1.13.15

5
src/encoding/binary/varint.go
View File

@ -106,13 +106,13 @@ var overflow = errors.New("binary: varint overflows a 64-bit integer")
func ReadUvarint(r io.ByteReader) (uint64, error) { func ReadUvarint(r io.ByteReader) (uint64, error) {
var x uint64 var x uint64
var s uint var s uint
for i := 0; ; i++ { for i := 0; i < MaxVarintLen64; i++ {
b, err := r.ReadByte() b, err := r.ReadByte()
if err != nil { if err != nil {
return x, err return x, err
} }
if b < 0x80 { if b < 0x80 {
if i > 9 || i == 9 && b > 1 { if i == 9 && b > 1 {
return x, overflow return x, overflow
} }
return x | uint64(b)<<s, nil return x | uint64(b)<<s, nil
@ -120,6 +120,7 @@ func ReadUvarint(r io.ByteReader) (uint64, error) {
x |= uint64(b&0x7f) << s x |= uint64(b&0x7f) << s
s += 7 s += 7
} }
return x, overflow
} }
// ReadVarint reads an encoded signed integer from r and returns it as an int64. // ReadVarint reads an encoded signed integer from r and returns it as an int64.

18
src/encoding/binary/varint_test.go
View File

@ -121,21 +121,27 @@ func TestBufferTooSmall(t *testing.T) {
} }
} }
func testOverflow(t *testing.T, buf []byte, n0 int, err0 error) { func testOverflow(t *testing.T, buf []byte, x0 uint64, n0 int, err0 error) {
x, n := Uvarint(buf) x, n := Uvarint(buf)
if x != 0 || n != n0 { if x != 0 || n != n0 {
t.Errorf("Uvarint(%v): got x = %d, n = %d; want 0, %d", buf, x, n, n0) t.Errorf("Uvarint(%v): got x = %d, n = %d; want 0, %d", buf, x, n, n0)
} }
x, err := ReadUvarint(bytes.NewReader(buf)) r := bytes.NewReader(buf)
if x != 0 || err != err0 { len := r.Len()
t.Errorf("ReadUvarint(%v): got x = %d, err = %s; want 0, %s", buf, x, err, err0) x, err := ReadUvarint(r)
if x != x0 || err != err0 {
t.Errorf("ReadUvarint(%v): got x = %d, err = %s; want %d, %s", buf, x, err, x0, err0)
}
if read := len - r.Len(); read > MaxVarintLen64 {
t.Errorf("ReadUvarint(%v): read more than MaxVarintLen64 bytes, got %d", buf, read)
} }
} }
func TestOverflow(t *testing.T) { func TestOverflow(t *testing.T) {
testOverflow(t, []byte{0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x2}, -10, overflow) testOverflow(t, []byte{0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x2}, 0, -10, overflow)
testOverflow(t, []byte{0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x1, 0, 0}, -13, overflow) testOverflow(t, []byte{0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x1, 0, 0}, 0, -13, overflow)
testOverflow(t, []byte{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, 1<<64-1, 0, overflow) // 11 bytes, should overflow
} }
func TestNonCanonicalZero(t *testing.T) { func TestNonCanonicalZero(t *testing.T) {