diff --git a/binary/jce/reader.go b/binary/jce/reader.go index 7771a3bd..558cef0a 100644 --- a/binary/jce/reader.go +++ b/binary/jce/reader.go @@ -3,13 +3,13 @@ package jce import ( "bytes" goBinary "encoding/binary" + "io" "math" "reflect" ) type JceReader struct { - buf *bytes.Reader - data []byte + buf *bytes.Reader } type HeadData struct { @@ -19,7 +19,7 @@ type HeadData struct { func NewJceReader(data []byte) *JceReader { buf := bytes.NewReader(data) - return &JceReader{buf: buf, data: data} + return &JceReader{buf: buf} } func (r *JceReader) readHead() (hd HeadData, l int32) { @@ -34,10 +34,10 @@ func (r *JceReader) readHead() (hd HeadData, l int32) { return hd, 1 } -func (r *JceReader) peakHead() (HeadData, int32) { - offset := r.buf.Size() - int64(r.buf.Len()) - n := NewJceReader(r.data[offset:]) - return n.readHead() +func (r *JceReader) peakHead() (h HeadData, l int32) { + h, l = r.readHead() + _, _ = r.buf.Seek(int64(-l), io.SeekCurrent) + return } func (r *JceReader) skip(l int) { @@ -99,7 +99,11 @@ func (r *JceReader) readBytes(len int) []byte { } func (r *JceReader) readByte() byte { - return r.readBytes(1)[0] + b, err := r.buf.ReadByte() + if err != nil { + panic(err) + } + return b } func (r *JceReader) readUInt16() uint16 { diff --git a/binary/jce/reader_test.go b/binary/jce/reader_test.go index 0a687501..cebad57b 100644 --- a/binary/jce/reader_test.go +++ b/binary/jce/reader_test.go @@ -35,7 +35,7 @@ func BenchmarkJceReader_ReadSlice(b *testing.B) { src := w.Bytes() b.SetBytes(int64(len(src))) b.StartTimer() - var result = []BigDataIPInfo{} + result := make([]BigDataIPInfo, 0) for i := 0; i < b.N; i++ { r := NewJceReader(src) r.ReadSlice(&result, 1)