Merge pull request #21407 from anntzer/cfe

jklymak · web-flow · commit 1f7b6d1cef95 · 2021-10-26T08:56:16.000+02:00
Stash exceptions when FT2Font closes the underlying stream.
diff --git a/src/ft2font_wrapper.cpp b/src/ft2font_wrapper.cpp
@@ -296,6 +296,8 @@ static unsigned long read_from_file_callback(FT_Stream stream,
 
 static void close_file_callback(FT_Stream stream)
 {
+    PyObject *type, *value, *traceback;
+    PyErr_Fetch(&type, &value, &traceback);
     PyFT2Font *self = (PyFT2Font *)stream->descriptor.pointer;
     PyObject *close_result = NULL;
     if (!(close_result = PyObject_CallMethod(self->py_file, "close", ""))) {
@@ -307,6 +309,7 @@ static void close_file_callback(FT_Stream stream)
     if (PyErr_Occurred()) {
         PyErr_WriteUnraisable((PyObject*)self);
     }
+    PyErr_Restore(type, value, traceback);
 }
 
 static PyTypeObject PyFT2FontType;

Original file line number	Diff line number	Diff line change
`@@ -296,6 +296,8 @@ static unsigned long read_from_file_callback(FT_Stream stream,`
`296`	`296`
`297`	`297`	`static void close_file_callback(FT_Stream stream)`
`298`	`298`	`{`
	`299`	`+ PyObject type, value, *traceback;`
	`300`	`+ PyErr_Fetch(&type, &value, &traceback);`
`299`	`301`	`PyFT2Font self = (PyFT2Font )stream->descriptor.pointer;`
`300`	`302`	`PyObject *close_result = NULL;`
`301`	`303`	`if (!(close_result = PyObject_CallMethod(self->py_file, "close", ""))) {`
`@@ -307,6 +309,7 @@ static void close_file_callback(FT_Stream stream)`
`307`	`309`	`if (PyErr_Occurred()) {`
`308`	`310`	`PyErr_WriteUnraisable((PyObject*)self);`
`309`	`311`	`}`
	`312`	`+ PyErr_Restore(type, value, traceback);`
`310`	`313`	`}`
`311`	`314`
`312`	`315`	`static PyTypeObject PyFT2FontType;`