Better error handling with font can not be loaded by macosx backend

mdboom · mdboom · commit 01ce972b5539 · 2013-09-23T08:56:19.000-04:00
diff --git a/src/_macosx.m b/src/_macosx.m
@@ -2567,6 +2567,10 @@ static CGRect _find_enclosing_rect(CGPoint points[3])
 #endif
         CFRelease(string);
     }
+    if (font == NULL)
+    {
+        PyErr_SetString(PyExc_ValueError, "Could not load font");
+    }
 #ifndef COMPILING_FOR_10_5
     CGContextSelectFont(cr, name, size, kCGEncodingMacRoman);
 #endif
@@ -2632,7 +2636,11 @@ static CGRect _find_enclosing_rect(CGPoint points[3])
     CFStringRef s = CFStringCreateWithCharacters(kCFAllocatorDefault, text, n);
 #endif
 
-    font = setfont(cr, family, size, weight, italic);
+    if (!(font = setfont(cr, family, size, weight, italic)))
+    {
+        CFRelease(s);
+        return NULL;
+    }
 
     color = CGColorCreateGenericRGB(self->color[0],
                                     self->color[1],
@@ -2739,7 +2747,11 @@ static CGRect _find_enclosing_rect(CGPoint points[3])
     CFStringRef s = CFStringCreateWithCharacters(kCFAllocatorDefault, text, n);
 #endif
 
-    font = setfont(cr, family, size, weight, italic);
+    if (!(font = setfont(cr, family, size, weight, italic)))
+    {
+        CFRelease(s);
+        return NULL;
+    };
 
     CFStringRef keys[1];
     CFTypeRef values[1];
@@ -2810,7 +2822,10 @@ static CGRect _find_enclosing_rect(CGPoint points[3])
                                 &italic,
                                 &angle)) return NULL;
 
-    atsfont = setfont(cr, family, size, weight, italic);
+    if (!(atsfont = setfont(cr, family, size, weight, italic))
+    {
+        return NULL;
+    }
 
     OSStatus status;
 
@@ -2895,7 +2910,10 @@ static CGRect _find_enclosing_rect(CGPoint points[3])
 
     if(!PyArg_ParseTuple(args, "u#Ofss", &text, &n, &family, &size, &weight, &italic)) return NULL;
 
-    atsfont = setfont(cr, family, size, weight, italic);
+    if (!(atsfont = setfont(cr, family, size, weight, italic)))
+    {
+        return NULL;
+    }
 
     OSStatus status = noErr;
     ATSUAttributeTag tags[] = {kATSUFontTag,
