Changeset 52300 in webkit

Timestamp:

Dec 17, 2009 10:12:35 PM (14 years ago)

Author:

eric@webkit.org

Message:

2009-12-17 Justin Schuh <​jschuh@chromium.org>

Reviewed by Dan Bernstein.

Bug 32357: SVG test case crashes WebKit (invalid font URL)
​https://bugs.webkit.org/show_bug.cgi?id=32357

Added check for NULL return value from DocLoader::requestFont()

• svg/text/text-font-uri-invalid-expected.txt: Added.
• svg/text/text-font-uri-invalid.svg: Added.

2009-12-17 Justin Schuh <​jschuh@chromium.org>

Reviewed by Dan Bernstein.

Bug 32357: SVG test case crashes WebKit (invalid font URL)
​https://bugs.webkit.org/show_bug.cgi?id=32357

Added check for NULL return value from DocLoader::requestFont()

• svg/SVGFontFaceUriElement.cpp: (WebCore::SVGFontFaceUriElement::loadFont):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/svg/text/text-font-uri-invalid-expected.txt (added)
• LayoutTests/svg/text/text-font-uri-invalid.svg (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/svg/SVGFontFaceUriElement.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-12-17  Justin Schuh  <jschuh@chromium.org>
+
+        Reviewed by Dan Bernstein.
+
+        Bug 32357: SVG test case crashes WebKit (invalid font URL)
+        https://bugs.webkit.org/show_bug.cgi?id=32357
+
+        Added check for NULL return value from DocLoader::requestFont()
+
+        * svg/text/text-font-uri-invalid-expected.txt: Added.
+        * svg/text/text-font-uri-invalid.svg: Added.
+
 2009-12-17  Shinichiro Hamaji  <hamaji@chromium.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-12-17  Justin Schuh  <jschuh@chromium.org>
+
+        Reviewed by Dan Bernstein.
+
+        Bug 32357: SVG test case crashes WebKit (invalid font URL)
+        https://bugs.webkit.org/show_bug.cgi?id=32357
+
+        Added check for NULL return value from DocLoader::requestFont()
+
+        * svg/SVGFontFaceUriElement.cpp:
+        (WebCore::SVGFontFaceUriElement::loadFont):
+
 2009-12-17  Shinichiro Hamaji  <hamaji@chromium.org>
 

trunk/WebCore/svg/SVGFontFaceUriElement.cpp

@@ -92 +92 @@
         DocLoader* docLoader = document()->docLoader();
         m_cachedFont = docLoader->requestFont(href);
-        m_cachedFont->setSVGFont(true);
-        m_cachedFont->addClient(this);
-        m_cachedFont->beginLoadIfNeeded(docLoader);
+        if (m_cachedFont) {
+            m_cachedFont->setSVGFont(true);
+            m_cachedFont->addClient(this);
+            m_cachedFont->beginLoadIfNeeded(docLoader);
+        }
     } else
         m_cachedFont = 0;