Skip to content

fix: reject truncated encoded integers #439

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wesen wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: reject truncated encoded integers #439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions memuvarint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ package zap

import (
"fmt"
"io"
)

type memUvarintReader struct {
Expand Down Expand Up @@ -50,6 +51,10 @@ func (r *memUvarintReader) ReadUvarint() (uint64, error) {
var S = r.S

for {
if C >= len(S) {
r.C = C
return 0, io.ErrUnexpectedEOF
}
b := S[C]
C++

Expand Down
15 changes: 15 additions & 0 deletions memuvarint_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,25 @@ package zap
import (
"bytes"
"encoding/binary"
"errors"
"io"
"math"
"testing"
)

func TestMemUvarintReaderReturnsUnexpectedEOFForTruncatedValue(t *testing.T) {
for _, input := range [][]byte{{0x80}, {0x80, 0x80}, {0xff, 0xff, 0xff}} {
reader := newMemUvarintReader(input)
_, err := reader.ReadUvarint()
if !errors.Is(err, io.ErrUnexpectedEOF) {
t.Fatalf("ReadUvarint(%x) error = %v, want %v", input, err, io.ErrUnexpectedEOF)
}
if reader.C != len(input) {
t.Fatalf("ReadUvarint(%x) consumed %d bytes, want %d", input, reader.C, len(input))
}
}
}

func BenchmarkUvarint(b *testing.B) {
n, buf := generateCommonUvarints(64, 512)

Expand Down