Commit a80cad0e authored by rniwa@webkit.org's avatar rniwa@webkit.org

2011-01-07 Ryosuke Niwa <rniwa@webkit.org>

        Unreviewed; Added the missing null pointer check for r75293.

        * dom/Document.cpp:
        (WebCore::Document::adoptNode):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75307 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent b211c4bd
2011-01-07 Ryosuke Niwa <rniwa@webkit.org>
Unreviewed; Added the missing null pointer check for r75293.
* dom/Document.cpp:
(WebCore::Document::adoptNode):
2011-01-07 Stephanie Lewis <slewis@apple.com>
Reviewed by Geoff Garen.
......
......@@ -899,7 +899,7 @@ PassRefPtr<Node> Document::adoptNode(PassRefPtr<Node> source, ExceptionCode& ec)
default:
if (source->hasTagName(iframeTag)) {
HTMLIFrameElement* iframe = static_cast<HTMLIFrameElement*>(source.get());
if (frame()->tree()->isDescendantOf(iframe->contentFrame())) {
if (frame() && frame()->tree()->isDescendantOf(iframe->contentFrame())) {
ec = HIERARCHY_REQUEST_ERR;
return 0;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment