提交 16f85704 作者: Jeromy Johnson 提交者: GitHub

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

commands: fix panic when stdin is empty for string args
...@@ -240,13 +240,19 @@ func (r *request) VarArgs(f func(string) error) error { ...@@ -240,13 +240,19 @@ func (r *request) VarArgs(f func(string) error) error {
return err return err
} }
var any bool
scan := bufio.NewScanner(fi) scan := bufio.NewScanner(fi)
for scan.Scan() { for scan.Scan() {
any = true
err := f(scan.Text()) err := f(scan.Text())
if err != nil { if err != nil {
return err return err
} }
} }
if !any {
return f("")
}
return nil return nil
} }
......
...@@ -39,4 +39,12 @@ test_expect_success "'ipfs block get' output looks good" ' ...@@ -39,4 +39,12 @@ test_expect_success "'ipfs block get' output looks good" '
test_cmp expected_stat actual_stat 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 test_done
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论