ARROW-13037: [R] Incorrect param when creating Expression crashes R

thisisnic · nealrichardson · commit 1e26cc1cd0a0 · 2021-06-24T08:15:23.000-07:00
Closes apache#10584 from thisisnic/ARROW_13037-expression_crash Authored-by: Nic Crane <thisisnic@gmail.com> Signed-off-by: Neal Richardson <neal.p.richardson@gmail.com>
diff --git a/r/R/expression.R b/r/R/expression.R
@@ -104,8 +104,10 @@ Expression$create <- function(function_name,
                               args = list(...),
                               options = empty_named_list()) {
   assert_that(is.string(function_name))
+  assert_that(is_list_of(args, "Expression"), msg = "Expression arguments must be Expression objects")
   compute___expr__call(function_name, args, options)
 }
+
 Expression$field_ref <- function(name) {
   assert_that(is.string(name))
   compute___expr__field_ref(name)
diff --git a/r/tests/testthat/test-expression.R b/r/tests/testthat/test-expression.R
@@ -58,4 +58,10 @@ test_that("C++ expressions", {
   )
   # Interprets that as a list type
   expect_r6_class(f == c(1L, 2L), "Expression")
+  
+  expect_error(
+    Expression$create("add", 1, 2),
+    "Expression arguments must be Expression objects"
+  )
+  
 })
