fix JuliaLang#13028

tekverkp · Sep 16, 2015 · 00c7325 · 00c7325
1 parent fee7aff
commit 00c7325
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/base/datafmt.jl b/base/datafmt.jl
@@ -208,7 +208,7 @@ function result{T}(dlmstore::DLMStore{T})
  cells = dlmstore.data
  sbuff = dlmstore.sbuff
 
- if (lastcol < ncols) || (lastrow < nrows)
+ if (nrows > 0) && ((lastcol < ncols) || (lastrow < nrows))
  while lastrow <= nrows
  (lastcol == ncols) && (lastcol = 0; lastrow += 1)
  for cidx in (lastcol+1):ncols

diff --git a/test/readdlm.jl b/test/readdlm.jl
@@ -218,3 +218,10 @@ end
  reshape(Any[1,2000.1,Float64(22222222222222222222222222222222222222),true,0x3,false,10e6,-10.34], 2, 4), Any)
 
 @test isequaldlm(readcsv(IOBuffer("-9223355253176920979,9223355253176920979"), Int64), Int64[-9223355253176920979 9223355253176920979], Int64)
+
+# fix #13028
+for data in ["A B C", "A B C\n"]
+ data,hdr = readdlm(IOBuffer(data), header=true)
+ @test hdr == AbstractString["A" "B" "C"]
+ @test data == Array(Float64, 0, 3)
+end