Merge pull request #22 from D-Se/safe

Safe
D-Se · Nov 29, 2023 · 5a853c8 · 5a853c8
2 parents cbdb565 + 5574f50
commit 5a853c8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/inst/tinytest/test_err.R b/inst/tinytest/test_err.R
@@ -5,3 +5,6 @@ err <- "err"
 
 (TRUE ?~! er) := NULL
 error(FALSE ?~! err, err)
+
+t <- "a message"
+error(FALSE ?~! t, "a message")
diff --git a/src/ifelse.c b/src/ifelse.c
@@ -28,7 +28,10 @@ S rhs(S fml) {
     SEXP expr = CADR(fml);
     if(TYPEOF(expr) == LANGSXP && CAR(expr) == Rf_install("!")) {  // x ?~! y
       SEXP msg = CADR(expr);
-      err(str2char(TYPEOF(msg) == STRSXP ? msg : Rf_eval(msg, ENV(fml))));
+      if (TYPEOF(msg) != STRSXP) {
+        msg = Rf_eval(msg, ENV(fml));
+      }
+      Rf_errorcall(R_NilValue, "%s", str2char(msg)); // ensure string literal
     } else {
       return Rf_eval(expr, ENV(fml));                              // ~x
     }