Fix rchk issues

Author: lionel-

src/map.c

@@ -66,14 +66,14 @@ SEXP map_impl(SEXP env, SEXP x_name_, SEXP f_name_, SEXP type_) {
   SEXP i = Rf_install("i");
   SEXPTYPE type = Rf_str2type(CHAR(Rf_asChar(type_)));
 
-  SEXP x_val = Rf_eval(x, env);
+  SEXP x_val = PROTECT(Rf_eval(x, env));
   check_vector(x_val, ".x");
 
   int n = Rf_length(x_val);
   if (n == 0) {
     SEXP out = PROTECT(Rf_allocVector(type, 0));
     copy_names(x_val, out);
-    UNPROTECT(1);
+    UNPROTECT(2);
     return out;
   }
 
@@ -86,7 +86,7 @@ SEXP map_impl(SEXP env, SEXP x_name_, SEXP f_name_, SEXP type_) {
   SEXP out = PROTECT(call_loop(env, f_call, n, type, 1));
   copy_names(x_val, out);
 
-  UNPROTECT(3);
+  UNPROTECT(4);
 
   return out;
 }

src/pluck.c

@@ -201,6 +201,9 @@ SEXP pluck_impl(SEXP x, SEXP index, SEXP missing, SEXP strict_arg) {
     stop_bad_type(index, "a list", NULL, "where");
   }
 
+  PROTECT_INDEX idx;
+  PROTECT_WITH_INDEX(x, &idx);
+
   int n = Rf_length(index);
   bool strict = Rf_asLogical(strict_arg);
 
@@ -209,11 +212,13 @@ SEXP pluck_impl(SEXP x, SEXP index, SEXP missing, SEXP strict_arg) {
 
     if (is_function(index_i)) {
       x = extract_fn(x, index_i);
+      REPROTECT(x, idx);
       continue;
     }
     // Assume all S3 objects implement the vector interface
     if (OBJECT(x) && TYPEOF(x) != S4SXP) {
       x = extract_vector(x, index_i, i, strict);
+      REPROTECT(x, idx);
       continue;
     }
 
@@ -247,6 +252,7 @@ SEXP pluck_impl(SEXP x, SEXP index, SEXP missing, SEXP strict_arg) {
   }
 
  end:
+  UNPROTECT(1);
   return (Rf_length(x) == 0) ? missing : x;
 }
 

src/utils.c

@@ -11,19 +11,6 @@ SEXP sym_protect(SEXP x) {
   }
 }
 
-// The return value might be garbage-collected so should be used in
-// non-jumpy context
-const char* friendly_typeof(SEXP x) {
-  SEXP head = Rf_lang3(Rf_install(":::"), Rf_install("purrr"), Rf_install("friendly_type_of"));
-  SEXP call = Rf_lang2(PROTECT(head), PROTECT(sym_protect(x)));
-
-  PROTECT(call);
-  SEXP type = Rf_eval(call, R_BaseEnv);
-  UNPROTECT(2);
-
-  return CHAR(STRING_ELT(type, 0));
-}
-
 bool is_vector(SEXP x) {
   switch (TYPEOF(x)) {
   case LGLSXP:

src/utils.h

@@ -6,10 +6,6 @@
 
 SEXP sym_protect(SEXP x);
 
-// The return value might be garbage-collected so should be used in
-// non-jumpy context
-const char* friendly_typeof(SEXP x);
-
 bool is_vector(SEXP x);
 
 SEXP lang7(SEXP s, SEXP t, SEXP u, SEXP v, SEXP w, SEXP x, SEXP y);