Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 6 additions & 1 deletion bytes.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,12 @@ func bytesNativeFromBinary(buf []byte) (interface{}, []byte, error) {
if size > int64(len(buf)) {
return nil, nil, fmt.Errorf("cannot decode binary bytes: %s", io.ErrShortBuffer)
}
return buf[:size], buf[size:], nil

// allocate new byte slice to avoid referencing the same underlying array
out := make([]byte, size)
copy(out, buf[:size])

return out, buf[size:], nil
}

func stringNativeFromBinary(buf []byte) (interface{}, []byte, error) {
Expand Down
48 changes: 48 additions & 0 deletions bytes_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@
package goavro

import (
"bytes"
"encoding/json"
"fmt"
"strings"
"testing"
)
Expand Down Expand Up @@ -199,3 +201,49 @@ func TestStringCodecAcceptsBytes(t *testing.T) {
testTextEncodePass(t, schema, []byte("abcd"), []byte(`"abcd"`))
})
}

func TestBytesUnderlyingArray(t *testing.T) {
ensureMap := func(expectedMap, actualMap map[string]interface{}) {
if actual, expected := len(actualMap), len(expectedMap); actual != expected {
t.Errorf("GOT: %#v; WANT: %#v", actual, expected)
}
for k, v := range actualMap {
if actual, expected := fmt.Sprintf("%s", expectedMap[k]), fmt.Sprintf("%s", v); actual != expected {
t.Errorf("GOT: %#v; WANT: %#v", actual, expected)
}
}
}

c, err := NewCodec(`{"name":"r1","type":"record","fields":[{"name":"foo","type":"bytes"},{"name":"bar","type":"bytes"}]}`)
ensureError(t, err)

datumIn := map[string]interface{}{
"foo": []byte("abc"),
"bar": []byte("def"),
}

buf, err := c.BinaryFromNative(nil, datumIn)
ensureError(t, err)
if expected := []byte("\x06abc\x06def"); !bytes.Equal(buf, expected) {
t.Errorf("GOT: %#v; WANT: %#v", buf, expected)
}

// round trip
datumOut, buf, err := c.NativeFromBinary(buf)
ensureError(t, err)
if actual, expected := len(buf), 0; actual != expected {
t.Errorf("GOT: %#v; WANT: %#v", actual, expected)
}

datumOutMap, ok := datumOut.(map[string]interface{})
if !ok {
t.Errorf("GOT: %#v; WANT: %#v", ok, true)
}
ensureMap(datumIn, datumOutMap)

// manipulate foo
_ = append(datumOutMap["foo"].([]byte), 0, 0)

// datumOutMap should stay unchanged
ensureMap(datumIn, datumOutMap)
}