Changeset 145120 in webkit

Timestamp:

Mar 7, 2013, 12:49:23 PM (12 years ago)

Author:

Lucas Forschler

Message:

Merged r145013. <rdar://problem/13370880>

Location:

branches/safari-536.29-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• svg/SVGViewSpec.cpp (modified) (1 diff)

branches/safari-536.29-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-07  Lucas Forschler  <lforschler@apple.com>
+
+        Merge r145013
+
+    2013-03-06  Abhishek Arya  <inferno@chromium.org>
+
+            Crash in SVGViewSpec::viewTarget
+            https://bugs.webkit.org/show_bug.cgi?id=111648
+
+            Reviewed by Philip Rogers.
+
+            * svg/SVGViewSpec.cpp:
+            (WebCore::SVGViewSpec::viewTarget):
+
 2013-03-01  Brady Eidson  <beidson@apple.com>
 

branches/safari-536.29-branch/Source/WebCore/svg/SVGViewSpec.cpp

@@ -76 +76 @@
 SVGElement* SVGViewSpec::viewTarget() const
 {
-    return static_cast<SVGElement*>(m_contextElement->treeScope()->getElementById(m_viewTargetString));
+    Element* element = m_contextElement->treeScope()->getElementById(m_viewTargetString);
+    if (!element || !element->isSVGElement())
+        return 0;
+    return static_cast<SVGElement*>(element);
 }