Merge pull request #5 from gergness/fixes

Fix for segfaults with `read_list()`. Thanks @gergness! I confirmed that your changes fix #2 and #3 on my machine as well.

Author: dtburk

src/read_full.cpp

@@ -172,7 +172,10 @@ RObject read_list(
 
     if (cur_pos_rt[rt_index] >= out[rt_index][0]->size()) {
       // Resize by guessing from the progress bar
-      resizeAllColumns(out[rt_index], static_cast<int>((cur_pos_rt[rt_found] / data->progress_info().first) * 1.1));
+      double resize_scale = 1.1 / data->progress_info().first;
+      // But make sure you at least 1.5x size because it's better to overallocate
+      resize_scale = std::max(1.5, resize_scale);
+      resizeAllColumns(out[rt_index], static_cast<int>(cur_pos_rt[rt_index] * resize_scale));
     }
 
     // Check if raw line is long enough

tests/testthat/test-list-full.R

@@ -55,3 +55,32 @@ test_that("basic example matches long format", {
   )
 })
 
+test_that("Can read rectangular into a list including with an allocation", {
+  # Need to have at least 501 rows to guarantee rows are re-allocated
+  temp_file <- tempfile()
+  writeLines(
+    paste0(
+      rep(c("abcd", "efgh", "ijkl", "mnop", "qrst", "uvwx"), 100),
+      collapse = "\n"
+    ),
+    temp_file
+  )
+  actual <- hipread_list(
+    temp_file,
+    hip_fwf_widths(
+      c(1, 2, 1),
+      c("var1", "var2", "var3"),
+      c("character", "character", "character")
+    ),
+    hip_rt(1, 0)
+  )
+
+  expect_true(is.list(actual))
+  expect_equal(length(actual), 1)
+  expect_equal(nrow(actual[[1]]), 600)
+  expect_equal(ncol(actual[[1]]), 3)
+  expect_equal(
+    actual[[1]]$var1[1:7],
+    c("a", "e", "i", "m", "q", "u", "a")
+  )
+})