Changeset 86439 in webkit

Timestamp:

May 13, 2011 9:56:08 AM (13 years ago)

Author:

brettw@chromium.org

Message:

2011-05-13 Brett Wilson <​brettw@chromium.org>

Reviewed by Adam Barth.

Don't destroy a null FcPattern when failing to do a FontConfig match.
This crashes, and there's nothing FcDestroy could do with a null
pointer even if it didn't crash.
​https://bugs.webkit.org/show_bug.cgi?id=60777

• src/gtk/WebFontInfo.cpp: (WebKit::WebFontInfo::renderStyleForStrike):

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• src/gtk/WebFontInfo.cpp (modified) (1 diff)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-05-13  Brett Wilson  <brettw@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Don't destroy a null FcPattern when failing to do a FontConfig match.
+        This crashes, and there's nothing FcDestroy could do with a null
+        pointer even if it didn't crash.
+        https://bugs.webkit.org/show_bug.cgi?id=60777
+
+        * src/gtk/WebFontInfo.cpp:
+        (WebKit::WebFontInfo::renderStyleForStrike):
+
 2011-05-11  Hans Wennborg  <hans@chromium.org>
 

trunk/Source/WebKit/chromium/src/gtk/WebFontInfo.cpp

@@ -155 +155 @@
     out->setDefaults();
 
-    if (!match) {
-        FcPatternDestroy(match);
+    if (!match)
         return;
-    }
 
     FcBool b;