nsfont.m (ns_findfonts): Handle empty matchingDescs (Bug#11541).

diff --git a/src/ChangeLog b/src/ChangeLog
index 24f3305b870f97ce52a754c046a33778ce50faaa..a2f39db5a88368cd9108cb8622cb4d0a9749f4cb 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-08  Thomas Kappler <tkappler@gmail.com> (tiny change)
+
+       * nsfont.m (ns_findfonts): Handle empty matchingDescs (Bug#11541).
+
 2012-11-08  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        Use ad-hoc comparison function for the profiler's hash-tables.

diff --git a/src/nsfont.m b/src/nsfont.m
index 4f29d1d54a9ca2110426b8e55c15c168d0ecf4dc..d2e5108bb7f709aa788f6303b91f1ab96aa07091 100644 (file)
--- a/src/nsfont.m
+++ b/src/nsfont.m
@@ -559,7 +559,11 @@ ns_findfonts (Lisp_Object font_spec, BOOL isMatch)
     if (isMatch)
        [fkeys removeObject: NSFontFamilyAttribute];
 
-    matchingDescs = [fdesc matchingFontDescriptorsWithMandatoryKeys: fkeys];
+    if ([fkeys count] > 0)
+      matchingDescs = [fdesc matchingFontDescriptorsWithMandatoryKeys: fkeys];
+    else
+      matchingDescs = [NSMutableArray array];
+
     if (NSFONT_TRACE)
        NSLog(@"Got desc %@ and found %d matching fonts from it: ", fdesc,
              [matchingDescs count]);