[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 20e296de95be4f52fd720ce06e81eba2d7ebf15f
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 24 00:32:14 2003 +0000

    i	Fixed 3341119:  Crash when content contains nil (0x0) characters.
    
            Reviewed by Ken.
    
            * WebCoreSupport.subproj/WebTextRenderer.m:
            (-[WebTextRenderer _CG_drawRun:style:atPoint:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4697 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 943e324..881183e 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2003-07-23  Richard Williamson   <rjw at apple.com>
+
+	Fixed 3341119:  Crash when content contains nil (0x0) characters.
+
+        Reviewed by Ken.
+
+        * WebCoreSupport.subproj/WebTextRenderer.m:
+        (-[WebTextRenderer _CG_drawRun:style:atPoint:]):
+
 2003-07-23  Darin Adler  <darin at apple.com>
 
         Reviewed by John.
diff --git a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
index cfcad25..e6690a3 100644
--- a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
@@ -848,6 +848,10 @@ static void _drawGlyphs(NSFont *font, NSColor *color, CGGlyph *glyphs, CGSize *a
         endGlyph:&endGlyph
         numGlyphs: &numGlyphs];
         
+    // Eek.  We couldn't generate ANY glyphs for the run.
+    if (numGlyphs <= 0)
+        return;
+        
     // Fill the advances array.
     for (i = 0; i <= endGlyph; i++){
         advances[i].width = widthBuffer[i];

-- 
WebKit Debian packaging