Skip to content

Commit

Permalink
fix: (decoder) return io.EOF when read nothing from io.Reader (#254)
Browse files Browse the repository at this point in the history
* fix: (decoder) return io.EOF when read nothing from io.Reader

* build:(CI) codeql-analysis only use x86 machine
  • Loading branch information
AsterDY committed Jul 1, 2022
1 parent fc6f374 commit 55e3d10
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Expand Up @@ -23,7 +23,7 @@ on:
jobs:
analyze:
name: Analyze
runs-on: self-hosted
runs-on: [self-hosted, X64]
permissions:
actions: read
contents: read
Expand Down
3 changes: 3 additions & 0 deletions decoder/stream.go
Expand Up @@ -80,6 +80,9 @@ read_more:
if err != nil {
repeat = false
if err == io.EOF {
if len(buf) == 0 {
return err
}
break
}
self.err = err
Expand Down
14 changes: 14 additions & 0 deletions decoder/stream_test.go
Expand Up @@ -35,6 +35,20 @@ var (
strings.Repeat("2",1024)+`"} b {}`
)

func TestDecodeEmpty(t *testing.T) {
var str = ``
var r1 = strings.NewReader(str)
var v1 interface{}
var d1 = json.NewDecoder(r1)
var r2 = strings.NewReader(str)
var v2 interface{}
var d2 = NewStreamDecoder(r2)
es1 := d1.Decode(&v1)
ee1 := d2.Decode(&v2)
assert.Equal(t, es1, ee1)
assert.Equal(t, v1, v2)
}

func TestDecodeSingle(t *testing.T) {
var str = _Single_JSON

Expand Down

0 comments on commit 55e3d10

Please sign in to comment.