Error if get_namespace() fails (#396)

DavisVaughan · web-flow · commit 580c8deeb47b · 2024-08-26T14:53:04.000-04:00
Rather than hanging indefinitely when a function is called
diff --git a/NEWS.md b/NEWS.md
@@ -1,5 +1,8 @@
 # cpp11 (development version)
 
+* `cpp11::package` now errors if given a package name that hasn't been loaded
+  yet. Previously it would cause R to hang indefinitely (#317).
+
 * `cpp11::function` now protects its underlying function, for maximum safety
   (#294).
 
diff --git a/cpp11test/src/test-function.cpp b/cpp11test/src/test-function.cpp
@@ -36,4 +36,8 @@ context("function-C++") {
 
     close(con);
   }
+
+  test_that("unknown packages cause an error (#317)") {
+    expect_error_as(cpp11::package("definitely_not_a_package"), cpp11::unwind_exception);
+  }
 }
diff --git a/inst/include/cpp11/function.hpp b/inst/include/cpp11/function.hpp
@@ -68,7 +68,7 @@ class package {
       return R_BaseEnv;
     }
     sexp name_sexp = safe[Rf_install](name);
-    return safe[Rf_findVarInFrame](R_NamespaceRegistry, name_sexp);
+    return safe[detail::r_env_get](R_NamespaceRegistry, name_sexp);
   }
 
   // Either base env or in namespace registry, so no protection needed

Original file line number	Diff line number	Diff line change
`@@ -36,4 +36,8 @@ context("function-C++") {`
`36`	`36`
`37`	`37`	`close(con);`
`38`	`38`	`}`
	`39`	`+`
	`40`	`+ test_that("unknown packages cause an error (#317)") {`
	`41`	`+ expect_error_as(cpp11::package("definitely_not_a_package"), cpp11::unwind_exception);`
	`42`	`+ }`
`39`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ class package {`
`68`	`68`	`return R_BaseEnv;`
`69`	`69`	`}`
`70`	`70`	`sexp name_sexp = safe[Rf_install](name);`
`71`		`- return safe[Rf_findVarInFrame](R_NamespaceRegistry, name_sexp);`
	`71`	`+ return safe[detail::r_env_get](R_NamespaceRegistry, name_sexp);`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`// Either base env or in namespace registry, so no protection needed`