* nsfont.m (ns_charset_covers): Don't abort if no bitmap.

Fixes: debbugs:11853

* nsfont.m (ns_charset_covers): Don't abort if no bitmap.
Fixes: debbugs:11853
24ef80ae · Paul Eggert · 739ae010 · 24ef80ae · 24ef80ae
Commit 24ef80ae authored Jul 12, 2012 by Paul Eggert
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 0 deletions

src/ChangeLog src/ChangeLog +5 -0

src/nsfont.m src/nsfont.m +5 -0

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+2012-07-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* nsfont.m (ns_charset_covers): Don't abort if no bitmap (Bug#11853).
+	Report and trivial fix by BT Templeton.
+
 2012-07-13  Glenn Morris  <rgm@gnu.org>
  
 	* s/usg5-4-common.h (NSIG_MINIMUM): Let configure set it.

--- a/src/nsfont.m
+++ b/src/nsfont.m
@@ -271,6 +271,11 @@ static void ns_glyph_metrics (struct nsfont_info *font_info,
    const unsigned short *bytes2 = [[set2 bitmapRepresentation] bytes];
    int i, off = 0, tot = 0;

+    /* Work around what appears to be a GNUstep bug.
+       See <http://bugs.gnu.org/11853>.  */
+    if (! (bytes1 && bytes2))
+      return NO;
+
    for (i=0; i<4096; i++, bytes1++, bytes2++)
 	if (*bytes2)
 	  {