Merge pull request #17510 from QuLogic/invalid-font

jklymak · web-flow · commit c5c12ddcf4b8 · 2020-06-01T12:40:29.000-07:00
Fix exception handling in FT2Font init.
diff --git a/lib/matplotlib/tests/test_font_manager.py b/lib/matplotlib/tests/test_font_manager.py
@@ -1,4 +1,4 @@
-from io import BytesIO
+from io import BytesIO, StringIO
 import multiprocessing
 import os
 from pathlib import Path
@@ -128,6 +128,24 @@ def test_find_ttc():
         fig.savefig(BytesIO(), format="ps")
 
 
+def test_find_invalid(tmpdir):
+    tmp_path = Path(tmpdir)
+
+    with pytest.raises(FileNotFoundError):
+        get_font(tmp_path / 'non-existent-font-name.ttf')
+
+    with pytest.raises(FileNotFoundError):
+        get_font(str(tmp_path / 'non-existent-font-name.ttf'))
+
+    with pytest.raises(FileNotFoundError):
+        get_font(bytes(tmp_path / 'non-existent-font-name.ttf'))
+
+    # Not really public, but get_font doesn't expose non-filename constructor.
+    from matplotlib.ft2font import FT2Font
+    with pytest.raises(TypeError, match='path or binary-mode file'):
+        FT2Font(StringIO())
+
+
 @pytest.mark.skipif(sys.platform != 'linux', reason='Linux only')
 def test_user_fonts_linux(tmpdir, monkeypatch):
     font_test_file = 'mpltest.ttf'
diff --git a/src/ft2font_wrapper.cpp b/src/ft2font_wrapper.cpp
@@ -488,12 +488,14 @@ static int PyFT2Font_init(PyFT2Font *self, PyObject *args, PyObject *kwds)
                || !PyBytes_Check(data)) {
         PyErr_SetString(PyExc_TypeError,
                         "First argument must be a path or binary-mode file object");
+        Py_CLEAR(data);
         goto exit;
     } else {
         self->py_file = filename;
         self->stream.close = NULL;
         Py_INCREF(filename);
     }
+    Py_CLEAR(data);
 
     CALL_CPP_FULL(
         "FT2Font", (self->x = new FT2Font(open_args, hinting_factor)),
@@ -505,9 +507,7 @@ static int PyFT2Font_init(PyFT2Font *self, PyObject *args, PyObject *kwds)
     self->fname = filename;
 
 exit:
-    Py_XDECREF(data);
-
-    return 0;
+    return PyErr_Occurred() ? -1 : 0;
 }
 
 static void PyFT2Font_dealloc(PyFT2Font *self)
