Fix edge case when coercing data frames to matrices

tidyverse · Aug 15, 2024 · 08f7436 · 08f7436
1 parent cdc9919
commit 08f7436
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/R/data-mask.R b/R/data-mask.R
@@ -11,7 +11,16 @@ DataMask <- R6Class("DataMask",
       frame <- caller_env(n = 2)
       local_mask(self, frame)
 
-      names_bindings <- chr_unserialise_unicode(names2(data))
+      names <- names(data)
+
+      if (is.null(names)) {
+        abort("Can't transform a data frame with `NULL` names.")
+      }
+      if (vec_any_missing(names)) {
+        abort("Can't transform a data frame with missing names.")
+      }
+
+      names_bindings <- chr_unserialise_unicode(names)
       if (any(names_bindings == "")) {
         # `names2()` converted potential `NA` names to `""` already
         abort("Can't transform a data frame with `NA` or `\"\"` names.", call = error_call)

diff --git a/tests/testthat/test-data-mask.R b/tests/testthat/test-data-mask.R
@@ -0,0 +1,7 @@
+test_that("Empty matrix can be coerced to a data frame (#7004)", {
+  skip_if_not(getRversion() >= "4.4")
+  expect_error(
+    slice(as.data.frame(matrix(nrow = 0, ncol = 0)), 1),
+    NA
+  )
+})