Mask definition of Rf_error to avoid longjmp issues

Author: Enchufa2

ChangeLog

@@ -3,10 +3,20 @@
 	* inst/include/Rcpp/hash/IndexHash.h: Normalize values for all comparisons
 	* inst/include/Rcpp/hash/SelfHash.h: Idem
 	* inst/tinytest/test_sugar.R: Add test for signed zeroes
+2025-10-28 Iñaki Ucar <iucar@fedoraproject.org>
+
+	* inst/include/Rcpp/macros/mask.h: Mask Rf_error with Rcpp::stop with
+	a warning at compilation time, unless RCPP_NO_MASK_RF_ERROR is defined
+	* inst/include/RcppCommon.h: Include the previous file in the last place
+	* inst/tinytest/cpp/stack.cpp: Define RCPP_NO_MASK_RF_ERROR to enable
+	Rf_error for this test
+	* src/attributes.cpp: Undef then re-include masking to allow generated
+	interface call to Rf_error
+	* inst/tinytest/testRcppInterfaceExporter/src/RcppExports.cpp: Idem
 
 2025-10-21 Iñaki Ucar <iucar@fedoraproject.org>
 
-	* inst/include/Rcpp/exceptions_impl.h: use __has_include to simplify checks
+	* inst/include/Rcpp/exceptions_impl.h: Use __has_include to simplify checks
 	to enable demangling, making them robust for more platforms
 
 2025-10-13  Dirk Eddelbuettel  <edd@debian.org>

inst/include/Rcpp/macros/mask.h

@@ -0,0 +1,24 @@
+// mask.h: Rcpp R/C++ interface class library -- masking macros
+//
+// Copyright (C) 2025        Iñaki Ucar
+//
+// This file is part of Rcpp.
+//
+// Rcpp is free software: you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
+//
+// Rcpp is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Rcpp.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef RCPP_NO_MASK_RF_ERROR
+ #define Rf_error \
+     _Pragma("GCC warning \"Invalid use of Rf_error, use Rcpp::stop instead\"") \
+     Rcpp::stop
+#endif

inst/include/RcppCommon.h

@@ -4,7 +4,7 @@
 //
 // Copyright (C) 2008 - 2009  Dirk Eddelbuettel
 // Copyright (C) 2009 - 2020  Dirk Eddelbuettel and Romain Francois
-// Copyright (C) 2021         Dirk Eddelbuettel, Romain Francois and Iñaki Ucar
+// Copyright (C) 2021 - 2025  Dirk Eddelbuettel, Romain Francois and Iñaki Ucar
 //
 // This file is part of Rcpp.
 //
@@ -191,4 +191,6 @@ namespace Rcpp {
 
 #include <Rcpp/internal/wrap.h>
 
+#include <Rcpp/macros/mask.h>
+
 #endif

inst/tinytest/cpp/stack.cpp

@@ -2,7 +2,8 @@
 //
 // misc.cpp: Rcpp R/C++ interface class library -- misc unit tests
 //
-// Copyright (C) 2013 - 2022  Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2013 - 2024  Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2025         Dirk Eddelbuettel, Romain Francois and Iñaki Ucar
 //
 // This file is part of Rcpp.
 //
@@ -21,6 +22,7 @@
 
 // [[Rcpp::plugins(cpp11)]]
 
+#define RCPP_NO_MASK_RF_ERROR
 #include <Rcpp.h>
 using namespace Rcpp;
 

inst/tinytest/testRcppInterfaceExporter/src/RcppExports.cpp

@@ -43,7 +43,9 @@ RcppExport SEXP _testRcppInterfaceExporter_test_cpp_interface(SEXP xSEXP, SEXP f
     if (rcpp_isError_gen) {
         SEXP rcpp_msgSEXP_gen = Rf_asChar(rcpp_result_gen);
         UNPROTECT(1);
+        #undef Rf_error
         Rf_error("%s", CHAR(rcpp_msgSEXP_gen));
+        #include <Rcpp/macros/mask.h>
     }
     UNPROTECT(1);
     return rcpp_result_gen;

src/attributes.cpp

@@ -2953,7 +2953,9 @@ namespace attributes {
                      << "    if (rcpp_isError_gen) {" << std::endl
                      << "        SEXP rcpp_msgSEXP_gen = Rf_asChar(rcpp_result_gen);" << std::endl
                      << "        UNPROTECT(1);" << std::endl
+                     << "        #undef Rf_error" << std::endl
                      << "        Rf_error(\"%s\", CHAR(rcpp_msgSEXP_gen));" << std::endl
+                     << "        #include <Rcpp/macros/mask.h>" << std::endl
                      << "    }" << std::endl
                      << "    UNPROTECT(1);" << std::endl
                      << "    return rcpp_result_gen;" << std::endl