Changeset 52492 in webkit

Timestamp:

Dec 22, 2009 10:51:00 AM (14 years ago)

Author:

eric@webkit.org

Message:

2009-12-22 Kwang Yul Seo <​skyul@company100.net>

Reviewed by Darin Adler.

Allocate RemoteFontStream on the heap
​https://bugs.webkit.org/show_bug.cgi?id=32850

RemoteFontStream is allocated on the stack, so its memory is freed
immediately when FontCustomPlatformData::createFontCustomPlatformData
returns.

SkTypeface::CreateFromStream increments the reference count, but it keeps
the pointer to the memory allocated on the stack which is not valid
anymore.

RemoteFontStream is a descendant of SkRefCount and SkRefCount::unref
invokes SkDELETE(this) internally once the reference count reaches zero.
This means that SkRefCount-ed instances must be allocated on the heap.

• platform/graphics/chromium/FontCustomPlatformData.cpp: (WebCore::createFontCustomPlatformData):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/chromium/FontCustomPlatformData.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-12-22  Kwang Yul Seo  <skyul@company100.net>
+
+        Reviewed by Darin Adler.
+
+        Allocate RemoteFontStream on the heap
+        https://bugs.webkit.org/show_bug.cgi?id=32850
+
+        RemoteFontStream is allocated on the stack, so its memory is freed
+        immediately when FontCustomPlatformData::createFontCustomPlatformData
+        returns. 
+
+        SkTypeface::CreateFromStream increments the reference count, but it keeps
+        the pointer to the memory allocated on the stack which is not valid
+        anymore.
+
+        RemoteFontStream is a descendant of SkRefCount and SkRefCount::unref
+        invokes SkDELETE(this) internally once the reference count reaches zero.
+        This means that SkRefCount-ed instances must be allocated on the heap.
+
+        * platform/graphics/chromium/FontCustomPlatformData.cpp:
+        (WebCore::createFontCustomPlatformData):
+
 2009-12-22  Kwang Yul Seo  <skyul@company100.net>
 

trunk/WebCore/platform/graphics/chromium/FontCustomPlatformData.cpp

@@ -191 +191 @@
     return new FontCustomPlatformData(fontReference, fontName);
 #elif PLATFORM(LINUX)
-    RemoteFontStream stream(buffer);
-    SkTypeface* typeface = SkTypeface::CreateFromStream(&stream);
+    RemoteFontStream* stream = new RemoteFontStream(buffer);
+    SkTypeface* typeface = SkTypeface::CreateFromStream(stream);
     if (!typeface)
         return 0;