diff options
| author | Ondřej Surý <ondrej@sury.org> | 2011-08-03 16:54:35 +0200 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2011-08-03 16:54:35 +0200 |
| commit | e390fedde07591d46022b7da5692af3fc2e782c6 (patch) | |
| tree | af2eb5968edb6324ba4d6d5cbd623daddb57edda /src/pkg/json/scanner_test.go | |
| parent | 041b8f207274852d514bcfa6e5941eefe61e9f60 (diff) | |
| parent | 28592ee1ea1f5cdffcf85472f9de0285d928cf12 (diff) | |
| download | golang-e390fedde07591d46022b7da5692af3fc2e782c6.tar.gz | |
Merge commit 'upstream/59' into debian-sid
Diffstat (limited to 'src/pkg/json/scanner_test.go')
| -rw-r--r-- | src/pkg/json/scanner_test.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/pkg/json/scanner_test.go b/src/pkg/json/scanner_test.go index 0d4de3246..023e7c81e 100644 --- a/src/pkg/json/scanner_test.go +++ b/src/pkg/json/scanner_test.go @@ -252,7 +252,10 @@ func genArray(n int) []interface{} { if f > n { f = n } - x := make([]interface{}, int(f)) + if n > 0 && f == 0 { + f = 1 + } + x := make([]interface{}, f) for i := range x { x[i] = genValue(((i+1)*n)/f - (i*n)/f) } |