Changeset 18085 in webkit for trunk/WebCore/xml/XMLSerializer.cpp

Timestamp:

Dec 8, 2006, 1:12:48 PM (18 years ago)

Author:

weinig

Message:

LayoutTests:

Reviewed by Geoff.

Testcases for ​http://bugs.webkit.org/show_bug.cgi?id=11777
Crash when using XMLSerializer.serializeToString() on
documentless, DocumentType nodes.

• fast/dom/XMLSerializer-doctype-expected.txt: Added.
• fast/dom/XMLSerializer-doctype.html: Added.
• fast/dom/XMLSerializer-doctype2-expected.txt: Added.
• fast/dom/XMLSerializer-doctype2.html: Added.

WebCore:

Reviewed by Geoff.

Fix for ​http://bugs.webkit.org/show_bug.cgi?id=11777
Crash when using XMLSerializer.serializeToString() on
documentless, DocumentType nodes.

Test: fast/dom/XMLSerializer-doctype.html
Test: fast/dom/XMLSerializer-doctype2.html

• dom/DOMImplementation.cpp: (WebCore::DOMImplementation::createDocument): set the document of the DocumentType node to the new document.
• xml/XMLSerializer.cpp: Cleanup. (WebCore::XMLSerializer::serializeToString): now throws an exception for documentless nodes.
• xml/XMLSerializer.h: cleanup
• xml/XMLSerializer.idl: add exception

File:

• trunk/WebCore/xml/XMLSerializer.cpp (modified) (2 diffs)

trunk/WebCore/xml/XMLSerializer.cpp

@@ -2 +2 @@
  *  This file is part of the KDE libraries
  *  Copyright (C) 2003, 2006 Apple Computer, Inc.
+ *  Copyright (C) 2006 Samuel Weinig ([email protected])
  *
  *  This library is free software; you can redistribute it and/or
@@ -22 +23 @@
 
 #include "Document.h"
+#include "ExceptionCode.h"
 #include "markup.h"
 
 namespace WebCore {
 
-String XMLSerializer::serializeToString(Node* node)
+String XMLSerializer::serializeToString(Node* node, ExceptionCode& ec)
 {
     if (!node)
         return String();
-    
+
+    if (!node->document()) {
+        // Due to the fact that DocumentType nodes are created by the DOMImplementation
+        // and not the Document, it is possible for it to not have a Document associated
+        // with it.  It should be the only type of node where this is possible.
+        ASSERT(node->nodeType() == Node::DOCUMENT_TYPE_NODE);
+
+        ec = INVALID_ACCESS_ERR;
+        return String();
+    }
+
     return createMarkup(node);
 }
 
-}
+} // namespace WebCore