summaryrefslogtreecommitdiff
path: root/src/encoding
diff options
context:
space:
mode:
authorRob Findley <rfindley@google.com>2020-09-11 14:23:34 -0400
committerRob Findley <rfindley@google.com>2020-09-11 14:23:34 -0400
commitf8b1c17aced24a1618c6984794be9770c5d260be (patch)
tree45af8d39b5c3d9f43d439ebec0a2ba42b49efe70 /src/encoding
parente5d91ab096a9ff9673311f1a7f3f860a7f9c2062 (diff)
parent07c1788357cfe6a4ee5f6f6a54d4fe9f579fa844 (diff)
downloadgo-git-dev.types.tar.gz
[dev.types] all: merge master into dev.typesdev.types
Change-Id: Ia6964cb4e09153c15cc9c5b441373d1b3cb8f757
Diffstat (limited to 'src/encoding')
-rw-r--r--src/encoding/binary/varint.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/encoding/binary/varint.go b/src/encoding/binary/varint.go
index 38af61075c..1fa325dec7 100644
--- a/src/encoding/binary/varint.go
+++ b/src/encoding/binary/varint.go
@@ -62,7 +62,7 @@ func Uvarint(buf []byte) (uint64, int) {
var s uint
for i, b := range buf {
if b < 0x80 {
- if i > 9 || i == 9 && b > 1 {
+ if i >= MaxVarintLen64 || i == MaxVarintLen64-1 && b > 1 {
return 0, -(i + 1) // overflow
}
return x | uint64(b)<<s, i + 1
@@ -112,7 +112,7 @@ func ReadUvarint(r io.ByteReader) (uint64, error) {
return x, err
}
if b < 0x80 {
- if i == 9 && b > 1 {
+ if i == MaxVarintLen64-1 && b > 1 {
return x, overflow
}
return x | uint64(b)<<s, nil