[Emacs-diffs] /srv/bzr/emacs/trunk r109063: * nsfont.m (ns_charset_covers): Don't abort if no bitmap.

[Paul Eggert]

------------------------------------------------------------
revno: 109063
fixes bug: http://debbugs.gnu.org/11853
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Thu 2012-07-12 18:37:11 -0700
message:
  * nsfont.m (ns_charset_covers): Don't abort if no bitmap.
modified:
  src/ChangeLog
  src/nsfont.m

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-07-13 01:19:06 +0000
+++ b/src/ChangeLog     2012-07-13 01:37:11 +0000
@@ -1,3 +1,8 @@
+2012-07-13  Paul Eggert  <address@hidden>
+
+       * 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  <address@hidden>
 
        * s/usg5-4-common.h (NSIG_MINIMUM): Let configure set it.

=== modified file 'src/nsfont.m'
--- a/src/nsfont.m      2012-07-05 18:35:48 +0000
+++ b/src/nsfont.m      2012-07-13 01:37:11 +0000
@@ -271,6 +271,11 @@
     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)
          {