ft2font null checks added

beelauuu · beelauuu · commit 46ebe0a373c1 · 2026-04-23T15:23:43.000-04:00
diff --git a/src/ft2font.h b/src/ft2font.h
@@ -41,7 +41,7 @@ inline char const* ft_error_string(FT_Error error) {
 #undef __FTERRORS_H__
 #define FT_ERROR_START_LIST     switch (error) {
 #define FT_ERRORDEF( e, v, s )    case v: return s;
-#define FT_ERROR_END_LIST         default: return NULL; }
+#define FT_ERROR_END_LIST         default: return "unknown error"; }
 #include FT_ERRORS_H
 }
 
diff --git a/src/ft2font_wrapper.cpp b/src/ft2font_wrapper.cpp
@@ -409,9 +409,9 @@ class PyFT2Font final : public FT2Font
     {
         std::set<FT_String*>::iterator it = family_names.begin();
         std::stringstream ss;
-        ss<<*it;
+        ss<< (*it ? *it : "unknown family name");
         while(++it != family_names.end()){
-            ss<<", "<<*it;
+            ss<<", "<< (*it ? *it : "unknown family name");
         }
 
         auto text_helpers = py::module_::import("matplotlib._text_helpers");

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ inline char const* ft_error_string(FT_Error error) {`
`41`	`41`	`#undef __FTERRORS_H__`
`42`	`42`	`#define FT_ERROR_START_LIST switch (error) {`
`43`	`43`	`#define FT_ERRORDEF( e, v, s ) case v: return s;`
`44`		`-#define FT_ERROR_END_LIST default: return NULL; }`
	`44`	`+#define FT_ERROR_END_LIST default: return "unknown error"; }`
`45`	`45`	`#include FT_ERRORS_H`
`46`	`46`	`}`
`47`	`47`
Original file line number	Diff line number	Diff line change
`@@ -409,9 +409,9 @@ class PyFT2Font final : public FT2Font`
`409`	`409`	`{`
`410`	`410`	`std::set<FT_String*>::iterator it = family_names.begin();`
`411`	`411`	`std::stringstream ss;`
`412`		`- ss<<*it;`
	`412`	`+ ss<< (it ? it : "unknown family name");`
`413`	`413`	`while(++it != family_names.end()){`
`414`		`- ss<<", "<<*it;`
	`414`	`+ ss<<", "<< (it ? it : "unknown family name");`
`415`	`415`	`}`
`416`	`416`
`417`	`417`	`auto text_helpers = py::module_::import("matplotlib._text_helpers");`