Merge pull request #1410 from dfalbel/segfault

Avoid segfault when raising Python errors that didn't set an exception.
rstudio · Jul 9, 2023 · f59e178 · f59e178
2 parents 9a712cb + aaa0d72
commit f59e178
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/python.cpp b/src/python.cpp
@@ -661,6 +661,11 @@ SEXP py_fetch_error(bool maybe_reuse_cached_r_trace) {
 
   PyObject *excType, *excValue, *excTraceback;
   PyErr_Fetch(&excType, &excValue, &excTraceback);  // we now own the PyObjects
+
+  if (!excType) {
+    Rcpp::stop("Unknown Python error.");
+  }
+
   PyErr_NormalizeException(&excType, &excValue, &excTraceback);
 
   if (excTraceback != NULL && excValue != NULL && s_isPython3) {