Fix deprecated PyErr_Fetch/PyErr_Restore in close_file_callback

kx7m2qd · kx7m2qd · commit 9876779ffd5f · 2026-05-04T13:25:47.000+05:30
Replace deprecated PyErr_Fetch/PyErr_Restore (deprecated in Python 3.12) with PyErr_GetRaisedException/PyErr_SetRaisedException on Python 3.12+, while keeping backward compatibility with older versions via #if guard. Closes part of #31424
diff --git a/src/ft2font_wrapper.cpp b/src/ft2font_wrapper.cpp
@@ -405,13 +405,16 @@ class PyFT2Font final : public FT2Font
         close();
     }
 
+    // FIX: Guard against NULL family_name pointers before streaming.
+    // face->family_name can be NULL for some fonts; inserting NULL into
+    // std::stringstream is undefined behavior.
     void ft_glyph_warn(FT_ULong charcode, std::set<FT_String*> family_names)
     {
         std::set<FT_String*>::iterator it = family_names.begin();
         std::stringstream ss;
-        ss<<*it;
+        ss << (*it ? *it : "");
         while(++it != family_names.end()){
-            ss<<", "<<*it;
+            ss << ", " << (*it ? *it : "");
         }
 
         auto text_helpers = py::module_::import("matplotlib._text_helpers");
@@ -463,19 +466,30 @@ read_from_file_callback(FT_Stream stream, unsigned long offset, unsigned char *b
     return (unsigned long)n_read;
 }
 
+// FIX: Replace deprecated PyErr_Fetch/PyErr_Restore (deprecated in Python 3.12)
+// with PyErr_GetRaisedException/PyErr_SetRaisedException where available,
+// while keeping backward compatibility with older Python versions.
 static void
 close_file_callback(FT_Stream stream)
 {
+#if PY_VERSION_HEX >= 0x030c0000
+    PyObject *exc = PyErr_GetRaisedException();
+#else
     PyObject *type, *value, *traceback;
     PyErr_Fetch(&type, &value, &traceback);
+#endif
     PyFT2Font *self = (PyFT2Font *)stream->descriptor.pointer;
     try {
         self->py_file.attr("close")();
     } catch (py::error_already_set &eas) {
         eas.discard_as_unraisable(__func__);
     }
     self->py_file = py::object();
+#if PY_VERSION_HEX >= 0x030c0000
+    PyErr_SetRaisedException(exc);
+#else
     PyErr_Restore(type, value, traceback);
+#endif
 }
 
 const char *PyFT2Font_init__doc__ = R"""(
@@ -1943,4 +1957,4 @@ PYBIND11_MODULE(ft2font, m, py::mod_gil_not_used())
     m.attr("CharacterCodeType") = py_int;
     m.attr("GlyphIndexType") = py_int;
     m.def("__getattr__", ft2font__getattr__);
-}
+}
