Skip to content

Add sanity checks to map / list deserialization #64

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
nuance wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add sanity checks to map / list deserialization #64

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
17 changes: 17 additions & 0 deletions thrift/protocol_binary.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ package thrift

import (
"encoding/binary"
"errors"
"io"
"math"
)
Expand Down Expand Up @@ -277,6 +278,14 @@ func (p *binaryProtocolReader) ReadFieldEnd() error {
return nil
}

func (p *binaryProtocolReader) validateSize(sz int) bool {
if fr, ok := p.r.(*FramedReadWriteCloser); ok {
return sz <= fr.rbuf.Len()
}

return true
}

func (p *binaryProtocolReader) ReadMapBegin() (keyType byte, valueType byte, size int, err error) {
if keyType, err = p.ReadByte(); err != nil {
return
Expand All @@ -287,6 +296,10 @@ func (p *binaryProtocolReader) ReadMapBegin() (keyType byte, valueType byte, siz
var sz int32
sz, err = p.ReadI32()
size = int(sz)

if !p.validateSize(size) {
err = errors.New("map is too large")
Copy link
Contributor

@jparise jparise Oct 8, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Include the invalid size?

}
return
}

Expand All @@ -301,6 +314,10 @@ func (p *binaryProtocolReader) ReadListBegin() (elementType byte, size int, err
var sz int32
sz, err = p.ReadI32()
size = int(sz)

if !p.validateSize(size) {
err = errors.New("list is too large")
Copy link
Contributor

@jparise jparise Oct 8, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Include the invalid size?

}
return
}

Expand Down