Skip to content

Commit 9f52058

Browse files
committed
Merge branch 'master' of github.com:IncSW/geoip2
2 parents 7afdc88 + ac44aac commit 9f52058

File tree

2 files changed

+11
-0
lines changed

2 files changed

+11
-0
lines changed

reader.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,10 @@ func (r *reader) readRight(nodeNumber uint) uint {
8989
}
9090

9191
func newReader(buffer []byte) (*reader, error) {
92+
if len(buffer) == 0 {
93+
return nil, errors.New("buffer is empty")
94+
}
95+
9296
metadataStart := bytes.LastIndex(buffer, metadataStartMarker)
9397
metadata, err := readMetadata(buffer[metadataStart+len(metadataStartMarker):])
9498
if err != nil {

reader_test.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,13 @@ func TestAnonymousIP(t *testing.T) {
5353
}
5454
}
5555

56+
func TestReaderZeroLength(t *testing.T) {
57+
_, err := newReader([]byte{})
58+
if err == nil {
59+
t.Fatal()
60+
}
61+
}
62+
5663
func TestCity(t *testing.T) {
5764
reader, err := NewCityReaderFromFile("testdata/GeoIP2-City-Test.mmdb")
5865
if err != nil {

0 commit comments

Comments
 (0)