diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2016-02-29 22:05:37 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2016-02-29 22:05:37 +0800 |
| commit | 4044a8cea44cd4cee3a8ddaf51a76b71c9d22042 (patch) | |
| tree | 1aa3776381e8e117b66e4a8ed1bf83e29d966ff1 /rlp/encode.go | |
| parent | c541b38fb36587d23c60f5e2f2b9b3c8700ec489 (diff) | |
| parent | 61be63bb9b8527bb3e2357ad35a0f4ef29304da1 (diff) | |
| download | go-tangerine-1.3.4.tar go-tangerine-1.3.4.tar.gz go-tangerine-1.3.4.tar.bz2 go-tangerine-1.3.4.tar.lz go-tangerine-1.3.4.tar.xz go-tangerine-1.3.4.tar.zst go-tangerine-1.3.4.zip | |
Merge pull request #2258 from obscuren/release/1.3.4v1.3.4
Homestead Release Candidate
Diffstat (limited to 'rlp/encode.go')
| -rw-r--r-- | rlp/encode.go | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/rlp/encode.go b/rlp/encode.go index d73b17c28..17cfc6b66 100644 --- a/rlp/encode.go +++ b/rlp/encode.go @@ -345,7 +345,7 @@ var ( ) // makeWriter creates a writer function for the given type. -func makeWriter(typ reflect.Type) (writer, error) { +func makeWriter(typ reflect.Type, ts tags) (writer, error) { kind := typ.Kind() switch { case typ == rawValueType: @@ -371,7 +371,7 @@ func makeWriter(typ reflect.Type) (writer, error) { case kind == reflect.Array && isByte(typ.Elem()): return writeByteArray, nil case kind == reflect.Slice || kind == reflect.Array: - return makeSliceWriter(typ) + return makeSliceWriter(typ, ts) case kind == reflect.Struct: return makeStructWriter(typ) case kind == reflect.Ptr: @@ -507,20 +507,21 @@ func writeInterface(val reflect.Value, w *encbuf) error { return ti.writer(eval, w) } -func makeSliceWriter(typ reflect.Type) (writer, error) { +func makeSliceWriter(typ reflect.Type, ts tags) (writer, error) { etypeinfo, err := cachedTypeInfo1(typ.Elem(), tags{}) if err != nil { return nil, err } writer := func(val reflect.Value, w *encbuf) error { - lh := w.list() + if !ts.tail { + defer w.listEnd(w.list()) + } vlen := val.Len() for i := 0; i < vlen; i++ { if err := etypeinfo.writer(val.Index(i), w); err != nil { return err } } - w.listEnd(lh) return nil } return writer, nil |