Changeset 41762 in webkit

Timestamp:

Mar 17, 2009 7:43:32 AM (15 years ago)

Author:

xan@webkit.org

Message:

2009-03-16 Xan Lopez <​xlopez@igalia.com>

Reviewed by Holger Freyther.

​https://bugs.webkit.org/show_bug.cgi?id=24592
[GTK] Crash in FcPatternHash

Sanitize memory management in gtk fonts.

Release memory allocated by FontPlatformDataGtk in its own
destructor instead of doing it from other classes, and add copy
constructor and '=' operator to be able to track referenced
objects properly.

• platform/graphics/gtk/FontPlatformData.h:
• platform/graphics/gtk/FontPlatformDataGtk.cpp: (WebCore::FontPlatformData::operator=): (WebCore::FontPlatformData::FontPlatformData): (WebCore::FontPlatformData::~FontPlatformData):
• platform/graphics/gtk/SimpleFontDataGtk.cpp: (WebCore::SimpleFontData::platformDestroy):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/gtk/FontPlatformData.h (modified) (2 diffs)
• platform/graphics/gtk/FontPlatformDataGtk.cpp (modified) (3 diffs)
• platform/graphics/gtk/SimpleFontDataGtk.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-03-16  Xan Lopez  <xlopez@igalia.com>
+
+        Reviewed by Holger Freyther.
+
+        https://bugs.webkit.org/show_bug.cgi?id=24592
+        [GTK] Crash in FcPatternHash
+
+        Sanitize memory management in gtk fonts.
+
+        Release memory allocated by FontPlatformDataGtk in its own
+        destructor instead of doing it from other classes, and add copy
+        constructor and '=' operator to be able to track referenced
+        objects properly.
+
+        * platform/graphics/gtk/FontPlatformData.h:
+        * platform/graphics/gtk/FontPlatformDataGtk.cpp:
+        (WebCore::FontPlatformData::operator=):
+        (WebCore::FontPlatformData::FontPlatformData):
+        (WebCore::FontPlatformData::~FontPlatformData):
+        * platform/graphics/gtk/SimpleFontDataGtk.cpp:
+        (WebCore::SimpleFontData::platformDestroy):
+
 2009-03-17  Ariya Hidayat  <ariya.hidayat@nokia.com>
 

trunk/WebCore/platform/graphics/gtk/FontPlatformData.h

@@ -75 +75 @@
     FontPlatformData(float size, bool bold, bool italic);
     FontPlatformData(cairo_font_face_t* fontFace, int size, bool bold, bool italic);
+    FontPlatformData(const FontPlatformData&);
 
     ~FontPlatformData();
@@ -96 +97 @@
 
     bool operator==(const FontPlatformData&) const;
+    FontPlatformData& operator=(const FontPlatformData&);
     bool isHashTableDeletedValue() const {
 #if defined(USE_FREETYPE)

trunk/WebCore/platform/graphics/gtk/FontPlatformDataGtk.cpp

@@ -4 +4 @@
  * Copyright (C) 2007, 2008 Alp Toker <alp@atoker.com>
  * Copyright (C) 2007 Holger Hans Peter Freyther
+ * Copyright (C) 2009 Igalia S.L.
  * All rights reserved.
  *
@@ -162 +163 @@
 }
 
+FontPlatformData& FontPlatformData::operator=(const FontPlatformData& other)
+{
+    // Check for self-assignment.
+    if (this == &other)
+        return *this;
+
+    m_size = other.m_size;
+    m_syntheticBold = other.m_syntheticBold;
+    m_syntheticOblique = other.m_syntheticOblique;
+
+    if (other.m_scaledFont)
+        cairo_scaled_font_reference (other.m_scaledFont);
+    if (m_scaledFont)
+        cairo_scaled_font_destroy(m_scaledFont);
+    m_scaledFont = other.m_scaledFont;
+
+    if (other.m_pattern)
+        FcPatternReference(other.m_pattern);
+    if (m_pattern)
+        FcPatternDestroy(m_pattern);
+    m_pattern = other.m_pattern;
+
+    if (m_fallbacks) {
+        FcFontSetDestroy(m_fallbacks);
+        // This will be re-created on demand.
+        m_fallbacks = 0;
+    }
+
+    return *this;
+}
+
+FontPlatformData::FontPlatformData(const FontPlatformData& other)
+    : m_pattern(0)
+    , m_fallbacks(0)
+    , m_scaledFont(0)
+{
+    *this = other;
+}
+
 bool FontPlatformData::init()
 {
@@ -177 +217 @@
 FontPlatformData::~FontPlatformData()
 {
+    if (m_pattern && ((FcPattern*)-1 != m_pattern)) {
+        FcPatternDestroy(m_pattern);
+        m_pattern = 0;
+    }
+
+    if (m_fallbacks) {
+        FcFontSetDestroy(m_fallbacks);
+        m_fallbacks = 0;
+    }
+
+    if (m_scaledFont) {
+        cairo_scaled_font_destroy(m_scaledFont);
+        m_scaledFont = 0;
+    }
 }
 

trunk/WebCore/platform/graphics/gtk/SimpleFontDataGtk.cpp

@@ -65 +65 @@
     delete m_smallCapsFontData;
     m_smallCapsFontData = 0;
-
-    if (isCustomFont())
-        return;
-
-    if (m_font.m_pattern && ((FcPattern*)-1 != m_font.m_pattern)) {
-        FcPatternDestroy(m_font.m_pattern);
-        m_font.m_pattern = 0;
-    }
-
-    if (m_font.m_fallbacks) {
-        FcFontSetDestroy(m_font.m_fallbacks);
-        m_font.m_fallbacks = 0;
-    }
-
-    if (m_font.m_scaledFont) {
-        cairo_scaled_font_destroy(m_font.m_scaledFont);
-        m_font.m_scaledFont = 0;
-    }
 }