coosld/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2026-03-10 10:47:51 +08:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity

Merge pull request #3050 from ipfs/fix/stdin-zero-panic

Browse Source 
commands: fix panic when stdin is empty for string args
This commit is contained in:
Jeromy Johnson 2016-08-07 12:23:23 -07:00 committed by GitHub
commit 16f857040f
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
commands/request.go
View File

@ -240,13 +240,19 @@ func (r *request) VarArgs(f func(string) error) error {
return err
}
var any bool
scan := bufio.NewScanner(fi)
for scan.Scan() {
any = true
err := f(scan.Text())
if err != nil {
return err
}
}
if !any {
return f("")
}
return nil
}

8
test/sharness/t0050-block.sh
View File

@ -39,4 +39,12 @@ test_expect_success "'ipfs block get' output looks good" '
test_cmp expected_stat actual_stat
'
test_expect_success "'ipfs block stat' with nothing from stdin doesnt crash" '
test_expect_code 1 ipfs block stat < /dev/null 2> stat_out
'
test_expect_success "no panic in output" '
test_expect_code 1 grep "panic" stat_out
'
test_done