Skip to content

encoding/prototext: enforce RecursionLimit in skipValue/skipMessageValue #67

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

Closed
al4an444 wants to merge 1 commit into from
+6 −0
Closed

encoding/prototext: enforce RecursionLimit in skipValue/skipMessageValue #67

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
6 changes: 6 additions & 0 deletions encoding/prototext/decode.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -733,6 +733,9 @@ func (d decoder) unmarshalExpandedAny(typeURL string, pos int) ([]byte, error) {
// to the next field. It relies on Read returning an error if the types are not
// in valid sequence.
func (d decoder) skipValue() error {
if d.opts.RecursionLimit--; d.opts.RecursionLimit < 0 {
return errRecursionDepth
}
tok, err := d.Read()
if err != nil {
return err
Expand Down Expand Up @@ -768,6 +771,9 @@ func (d decoder) skipValue() error {
// skipMessageValue makes the decoder parse and skip over all fields in a
// message. It assumes that the previous read type is MessageOpen.
func (d decoder) skipMessageValue() error {
if d.opts.RecursionLimit--; d.opts.RecursionLimit < 0 {
return errRecursionDepth
}
for {
tok, err := d.Read()
if err != nil {
Expand Down