Title: [145120] branches/safari-536.29-branch/Source/WebCore
- Revision
- 145120
- Author
- lforsch...@apple.com
- Date
- 2013-03-07 12:49:23 -0800 (Thu, 07 Mar 2013)
Log Message
Merged r145013. <rdar://problem/13370880>
Modified Paths
Diff
Modified: branches/safari-536.29-branch/Source/WebCore/ChangeLog (145119 => 145120)
--- branches/safari-536.29-branch/Source/WebCore/ChangeLog 2013-03-07 20:43:05 UTC (rev 145119)
+++ branches/safari-536.29-branch/Source/WebCore/ChangeLog 2013-03-07 20:49:23 UTC (rev 145120)
@@ -1,3 +1,17 @@
+2013-03-07 Lucas Forschler <lforsch...@apple.com>
+
+ Merge r145013
+
+ 2013-03-06 Abhishek Arya <infe...@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 <beid...@apple.com>
Merge 143815
Modified: branches/safari-536.29-branch/Source/WebCore/svg/SVGViewSpec.cpp (145119 => 145120)
--- branches/safari-536.29-branch/Source/WebCore/svg/SVGViewSpec.cpp 2013-03-07 20:43:05 UTC (rev 145119)
+++ branches/safari-536.29-branch/Source/WebCore/svg/SVGViewSpec.cpp 2013-03-07 20:49:23 UTC (rev 145120)
@@ -75,7 +75,10 @@
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);
}
static const UChar svgViewSpec[] = {'s', 'v', 'g', 'V', 'i', 'e', 'w'};
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
