Handle exception in PyRun_SimpleFile and PyRun_AnyFile

These functions can fail with MemoryError

Author: vstinner

Modules/_testcapi/run.c

@@ -125,11 +125,14 @@ run_simplefile(PyObject *mod, PyObject *args)
     int fd = fileno(fp);
 
     int res = PyRun_SimpleFile(fp, filename);
-    assert(!PyErr_Occurred());
 
     assert(_Py_IsValidFD(fd));
     fclose(fp);
 
+    if (res == -1 && PyErr_Occurred()) {
+        return NULL;
+    }
+    assert(!PyErr_Occurred());
     return PyLong_FromLong(res);
 }
 
@@ -195,12 +198,15 @@ run_simplefileex(PyObject *mod, PyObject *args)
     int fd = fileno(fp);
 
     int res = PyRun_SimpleFileEx(fp, filename, closeit);
-    assert(!PyErr_Occurred());
 
     if (close_fd(fp, fd, closeit) < 0) {
         return NULL;
     }
 
+    if (res == -1 && PyErr_Occurred()) {
+        return NULL;
+    }
+    assert(!PyErr_Occurred());
     return PyLong_FromLong(res);
 }
 
@@ -232,12 +238,15 @@ run_simplefileexflags(PyObject *mod, PyObject *args)
     }
 
     int res = PyRun_SimpleFileExFlags(fp, filename, closeit, pflags);
-    assert(!PyErr_Occurred());
 
     if (close_fd(fp, fd, closeit) < 0) {
         return NULL;
     }
 
+    if (res == -1 && PyErr_Occurred()) {
+        return NULL;
+    }
+    assert(!PyErr_Occurred());
     return PyLong_FromLong(res);
 }
 
@@ -259,11 +268,14 @@ run_anyfile(PyObject *mod, PyObject *args)
     int fd = fileno(fp);
 
     int res = PyRun_AnyFile(fp, filename);
-    assert(!PyErr_Occurred());
 
     assert(_Py_IsValidFD(fd));
     fclose(fp);
 
+    if (res == -1 && PyErr_Occurred()) {
+        return NULL;
+    }
+    assert(!PyErr_Occurred());
     return PyLong_FromLong(res);
 }
 
@@ -294,11 +306,14 @@ run_anyfileflags(PyObject *mod, PyObject *args)
     }
 
     int res = PyRun_AnyFileFlags(fp, filename, pflags);
-    assert(!PyErr_Occurred());
 
     assert(_Py_IsValidFD(fd));
     fclose(fp);
 
+    if (res == -1 && PyErr_Occurred()) {
+        return NULL;
+    }
+    assert(!PyErr_Occurred());
     return PyLong_FromLong(res);
 }
 
@@ -322,12 +337,15 @@ run_anyfileex(PyObject *mod, PyObject *args)
     int fd = fileno(fp);
 
     int res = PyRun_AnyFileEx(fp, filename, closeit);
-    assert(!PyErr_Occurred());
 
     if (close_fd(fp, fd, closeit) < 0) {
         return NULL;
     }
 
+    if (res == -1 && PyErr_Occurred()) {
+        return NULL;
+    }
+    assert(!PyErr_Occurred());
     return PyLong_FromLong(res);
 }
 
@@ -359,12 +377,15 @@ run_anyfileexflags(PyObject *mod, PyObject *args)
     }
 
     int res = PyRun_AnyFileExFlags(fp, filename, closeit, pflags);
-    assert(!PyErr_Occurred());
 
     if (close_fd(fp, fd, closeit) < 0) {
         return NULL;
     }
 
+    if (res == -1 && PyErr_Occurred()) {
+        return NULL;
+    }
+    assert(!PyErr_Occurred());
     return PyLong_FromLong(res);
 }