[Emacs-diffs] /srv/bzr/emacs/trunk r110843: nsfont.m (ns_findfonts): Handle empty matchingDescs (Bug#11541).

[Jan D.]

------------------------------------------------------------
revno: 110843
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Thu 2012-11-08 20:51:07 +0100
message:
  nsfont.m (ns_findfonts): Handle empty matchingDescs (Bug#11541).
modified:
  src/ChangeLog
  src/nsfont.m

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-11-08 19:12:23 +0000
+++ b/src/ChangeLog     2012-11-08 19:51:07 +0000
@@ -1,3 +1,7 @@
+2012-11-08  Thomas Kappler <address@hidden> (tiny change)
+
+       * nsfont.m (ns_findfonts): Handle empty matchingDescs (Bug#11541).
+
 2012-11-08  Stefan Monnier  <address@hidden>
 
        Use ad-hoc comparison function for the profiler's hash-tables.

=== modified file 'src/nsfont.m'
--- a/src/nsfont.m      2012-10-21 18:48:11 +0000
+++ b/src/nsfont.m      2012-11-08 19:51:07 +0000
@@ -559,7 +559,11 @@
     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]);