From d6395a2c6768008b87af0eea411db625648cdc8f Mon Sep 17 00:00:00 2001
From: Zbynek Slajchrt <zbynek.slajchrt@oracle.com>
Date: Mon, 12 Feb 2018 19:54:20 +0100
Subject: [PATCH] Error code return pointer initialised to prevent random
values
---
.../fficall/src/truffle_common/Rinternals_truffle_common.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/com.oracle.truffle.r.native/fficall/src/truffle_common/Rinternals_truffle_common.h b/com.oracle.truffle.r.native/fficall/src/truffle_common/Rinternals_truffle_common.h
index 7cd0165310..aaf82384b1 100644
--- a/com.oracle.truffle.r.native/fficall/src/truffle_common/Rinternals_truffle_common.h
+++ b/com.oracle.truffle.r.native/fficall/src/truffle_common/Rinternals_truffle_common.h
@@ -1378,6 +1378,9 @@ SEXP Rf_asS4(SEXP x, Rboolean b, int i) {
static SEXP R_tryEvalInternal(SEXP x, SEXP y, int *ErrorOccurred, int silent) {
TRACE0();
+ if (ErrorOccurred) {
+ *ErrorOccurred = 0;
+ }
return ((call_R_tryEval) callbacks[R_tryEval_x])(x, y, ErrorOccurred, silent);
}
--
GitLab