Merge pull request #2613 from oasislabs/matevz/bug/mkvs-crash

go/storage/mkvs/urkel: fix invalid memory access when unmarshalling
oasisprotocol · Jan 29, 2020 · 56e6d7f · 56e6d7f
2 parents 9e89921 + 2f70937
commit 56e6d7f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.changelog/2611.bugfix.md b/.changelog/2611.bugfix.md
@@ -0,0 +1 @@
+go/storage: Fix invalid memory access crash in Urkel tree
diff --git a/go/storage/mkvs/urkel/node/node.go b/go/storage/mkvs/urkel/node/node.go
@@ -622,7 +622,8 @@ func (n *LeafNode) SizedUnmarshalBinary(data []byte) (int, error) {
 	valueSize := int(binary.LittleEndian.Uint32(data[pos : pos+ValueLengthSize]))
 	pos += ValueLengthSize
 
-	value := data[pos : pos+valueSize]
+	value := make([]byte, valueSize)
+	copy(value, data[pos:pos+valueSize])
 	pos += valueSize
 
 	n.Clean = true
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		go/storage: Fix invalid memory access crash in Urkel tree