[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[rniwa at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit a80cad0e1e7b692e34994d8e6518eff33ce58f85
Author: rniwa at webkit.org <rniwa at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jan 8 02:42:44 2011 +0000

    2011-01-07  Ryosuke Niwa  <rniwa at 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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e772750..0385faa 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2011-01-07  Ryosuke Niwa  <rniwa at webkit.org>
+
+        Unreviewed; Added the missing null pointer check for r75293.
+
+        * dom/Document.cpp:
+        (WebCore::Document::adoptNode):
+
 2011-01-07  Stephanie Lewis  <slewis at apple.com>
 
         Reviewed by Geoff Garen.
diff --git a/WebCore/dom/Document.cpp b/WebCore/dom/Document.cpp
index 53247f8..e4b1128 100644
--- a/WebCore/dom/Document.cpp
+++ b/WebCore/dom/Document.cpp
@@ -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;
             }

-- 
WebKit Debian packaging