[webkit-changes] cvs commit: WebKit/WebCoreSupport.subproj WebTextRenderer.m

[Adele]

adele       05/07/20 13:04:13

  Modified:    .        ChangeLog
               WebCoreSupport.subproj WebTextRenderer.m
  Log:
          Merged fix for :
          <rdar://problem/4118278> mail divide by zero navigating messages
  
          * WebCoreSupport.subproj/WebTextRenderer.m:
          (-[WebTextRenderer _extendGlyphToWidthMapToInclude:font:]):
  
  Revision  Changes    Path
  1.3241    +8 -0      WebKit/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebKit/ChangeLog,v
  retrieving revision 1.3240
  retrieving revision 1.3241
  diff -u -r1.3240 -r1.3241
  --- ChangeLog	20 Jul 2005 18:34:19 -0000	1.3240
  +++ ChangeLog	20 Jul 2005 20:04:10 -0000	1.3241
  @@ -1,3 +1,11 @@
  +2005-07-20  Adele Peterson  <adele at apple.com>
  +
  +        Merged fix for :
  +        <rdar://problem/4118278> mail divide by zero navigating messages
  +  
  +        * WebCoreSupport.subproj/WebTextRenderer.m:
  +        (-[WebTextRenderer _extendGlyphToWidthMapToInclude:font:]):
  +
   2005-07-20  John Sullivan  <sullivan at apple.com>
   
           Reviewed by Adele Peterson.
  
  
  
  1.181     +5 -1      WebKit/WebCoreSupport.subproj/WebTextRenderer.m
  
  Index: WebTextRenderer.m
  ===================================================================
  RCS file: /cvs/root/WebKit/WebCoreSupport.subproj/WebTextRenderer.m,v
  retrieving revision 1.180
  retrieving revision 1.181
  diff -u -r1.180 -r1.181
  --- WebTextRenderer.m	14 Jul 2005 02:43:51 -0000	1.180
  +++ WebTextRenderer.m	20 Jul 2005 20:04:13 -0000	1.181
  @@ -1413,7 +1413,11 @@
       }
       else
           blockSize = INCREMENTAL_BLOCK_SIZE;
  -    start = (glyphID / blockSize) * blockSize;
  +    if (blockSize == 0) {
  +        start = 0;
  +    } else {
  +        start = (glyphID / blockSize) * blockSize;
  +    }
       end = ((unsigned)start) + blockSize; 
       if (end > 0xffff)
           end = 0xffff;