Changeset 75975 in webkit

Timestamp:

Jan 17, 2011, 3:14:18 PM (14 years ago)

Author:

mitz@apple.com

Message:

Use of invalid hash map key in CSSFontFaceSource::getFontData() with 0-sized remote font
​https://bugs.webkit.org/show_bug.cgi?id=52598

Reviewed by Darin Adler.

Source/WebCore:

Test: fast/css/font-face-zero-hash-key.html

• css/CSSFontFaceSource.cpp:

(WebCore::CSSFontFaceSource::getFontData): Add 1 to the font size to avoid a 0 hash key.

• css/CSSSegmentedFontFace.cpp:

(WebCore::CSSSegmentedFontFace::getFontData): Ditto.

LayoutTests:

• fast/css/font-face-zero-hash-key-expected.txt: Added.
• fast/css/font-face-zero-hash-key.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/font-face-zero-hash-key-expected.txt (added)
• LayoutTests/fast/css/font-face-zero-hash-key.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSFontFaceSource.cpp (modified) (1 diff)
• Source/WebCore/css/CSSSegmentedFontFace.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-01-17  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Darin Adler.
+
+        Use of invalid hash map key in CSSFontFaceSource::getFontData() with 0-sized remote font
+        https://bugs.webkit.org/show_bug.cgi?id=52598
+
+        * fast/css/font-face-zero-hash-key-expected.txt: Added.
+        * fast/css/font-face-zero-hash-key.html: Added.
+
 2011-01-17  Helder Correia  <helder@sencha.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-01-17  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Darin Adler.
+
+        Use of invalid hash map key in CSSFontFaceSource::getFontData() with 0-sized remote font
+        https://bugs.webkit.org/show_bug.cgi?id=52598
+
+        Test: fast/css/font-face-zero-hash-key.html
+
+        * css/CSSFontFaceSource.cpp:
+        (WebCore::CSSFontFaceSource::getFontData): Add 1 to the font size to avoid a 0 hash key.
+        * css/CSSSegmentedFontFace.cpp:
+        (WebCore::CSSSegmentedFontFace::getFontData): Ditto.
+
 2011-01-17  David Kilzer  <ddkilzer@apple.com>
 

trunk/Source/WebCore/css/CSSFontFaceSource.cpp

@@ -116 +116 @@
 
     // See if we have a mapping in our FontData cache.
-    unsigned hashKey = fontDescription.computedPixelSize() << 3 | (fontDescription.orientation() == Vertical ? 4 : 0) | (syntheticBold ? 2 : 0) | (syntheticItalic ? 1 : 0);
+    unsigned hashKey = (fontDescription.computedPixelSize() + 1) << 3 | (fontDescription.orientation() == Vertical ? 4 : 0) | (syntheticBold ? 2 : 0) | (syntheticItalic ? 1 : 0);
     if (SimpleFontData* cachedData = m_fontDataTable.get(hashKey))
         return cachedData;

trunk/Source/WebCore/css/CSSSegmentedFontFace.cpp

@@ -89 +89 @@
 
     FontTraitsMask desiredTraitsMask = fontDescription.traitsMask();
-    unsigned hashKey = (fontDescription.computedPixelSize() << (FontTraitsMaskWidth + 1)) | ((fontDescription.orientation() == Vertical ? 1 : 0) << FontTraitsMaskWidth) | desiredTraitsMask;
+    unsigned hashKey = ((fontDescription.computedPixelSize() + 1) << (FontTraitsMaskWidth + 1)) | ((fontDescription.orientation() == Vertical ? 1 : 0) << FontTraitsMaskWidth) | desiredTraitsMask;
 
     SegmentedFontData* fontData = m_fontDataTable.get(hashKey);