third_party/mojo/src/mojo/public/go/bindings/decoder.go - Issue 1058033002: NOT TO COMMITTED: Update mojo sdk to rev 0018e6a91b75bcb941c867f8a7aa1753c3b53a13

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/mojo/src/mojo/public/go/bindings/decoder.go

Issue 1058033002: NOT TO COMMITTED: Update mojo sdk to rev 0018e6a91b75bcb941c867f8a7aa1753c3b53a13 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/mojo/src/mojo/public/go/application/connection.go ('k') | third_party/mojo/src/mojo/public/go/bindings/encoder.go » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/mojo/src/mojo/public/go/bindings/decoder.go

diff --git a/third_party/mojo/src/mojo/public/go/bindings/decoder.go b/third_party/mojo/src/mojo/public/go/bindings/decoder.go

index 34a230ef9acd8de1c430f195bc256d8889c6cf02..8f25c0b1e1639034c40a75dafd763d32893becfa 100644

--- a/third_party/mojo/src/mojo/public/go/bindings/decoder.go

+++ b/third_party/mojo/src/mojo/public/go/bindings/decoder.go

@@ -290,7 +290,6 @@ func (d *Decoder) ReadString() (string, error) {

// ReadPointer reads a pointer and reassigns first unclaimed byte index if the

// pointer is not null.

func (d *Decoder) ReadPointer() (uint64, error) {

- oldEnd := d.state().offset

pointer, err := d.ReadUint64()

if err != nil {

return pointer, err

@@ -299,7 +298,7 @@ func (d *Decoder) ReadPointer() (uint64, error) {

return pointer, nil

}

- newEnd := uint64(oldEnd) + pointer

+ newEnd := uint64(d.state().offset-8) + pointer

if newEnd >= uint64(len(d.buf)) {

return 0, fmt.Errorf("trying to access out of range memory")

}