Changeset 20452 for S60/trunk/WebCore

Timestamp:

03/23/07 13:53:05 (22 months ago)

Author:

brmorris

Message:

rathnasa, reviewed by zalan

DESC: [S60] ESMS-6YDMWP: TRUE - GSM - broswer crashes on certain web pages
Quick fix to validate null pointers
http://bugs.webkit.org/show_bug.cgi?id=13074

Location:

S60/trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• khtml/xml/dom_elementimpl.cpp (modified) (12 diffs)

S60/trunk/WebCore/ChangeLog

@@ +1 @@
+rathnasa, reviewed by zalan
+ DESC: [S60] ESMS-6YDMWP: TRUE - GSM - broswer crashes on certain web pages
+ Quick fix to validate null pointers
+ http://bugs.webkit.org/show_bug.cgi?id=13074
+
+        WARNING: NO TEST CASES ADDED OR CHANGED
+        
+        * khtml/xml/dom_elementimpl.cpp:
+        (AttrImpl::nodeName):
+        (ElementImpl::blur):
+        (ElementImpl::getAttributeNS):
+        (ElementImpl::tagName):
+        (ElementImpl::styleForRenderer):
+        (ElementImpl::createRenderer):
+        (ElementImpl::childAllowed):
+        (ElementImpl::dispatchAttrRemovalEvent):
+        (ElementImpl::dispatchAttrAdditionEvent):
+        (ElementImpl::updateId):
+        (XMLElementImpl::localName):
+        (XMLElementImpl::namespaceURI):
+        (XMLElementImpl::cloneNode):
+        (NamedAttrMapImpl::mapId):
+
 2007-03-23  bujtas  <zbujtas@gmail.com>
 

S60/trunk/WebCore/khtml/xml/dom_elementimpl.cpp

@@ -82 +82 @@
 DOMString AttrImpl::nodeName() const
 {
-    return getDocument()->attrName(m_attribute->id());
+    DocumentImpl *doc = getDocument();
+    if (doc) {
+        return doc->attrName(m_attribute->id());
+    }
+    else {
+        return DOMString();
+    }
 }
 
@@ -287 +293 @@
     DocumentImpl* doc = getDocument();
     if (doc && doc->focusNode() == this)
-    doc->setFocusNode(0);
+        doc->setFocusNode(0);
 }
 
@@ -293 +299 @@
                                                 const DOMString &localName) const
 {
-    NodeImpl::Id id = getDocument()->attrId(namespaceURI.implementation(),
+    DocumentImpl *doc = getDocument();
+    if (doc) {
+        NodeImpl::Id id = doc->attrId(namespaceURI.implementation(),
                                             localName.implementation(), true);
-    if (!id) return nullAtom;
-    return getAttribute(id);
+        if (!id) return nullAtom;
+        return getAttribute(id);
+    }
+    else {
+        return nullAtom;
+    }
 }
 
@@ -375 +387 @@
 DOMString ElementImpl::tagName() const
 {
-    DOMString tn = getDocument()->tagName(id());
-
-    if (m_prefix)
-        return DOMString(m_prefix) + ":" + tn;
-
-    return tn;
+    DocumentImpl *doc = getDocument();
+    if (doc) {
+        DOMString tn = doc->tagName(id());
+
+        if (m_prefix)
+            return DOMString(m_prefix) + ":" + tn;
+
+        return tn;
+    }
+    else {
+        return DOMString();
+    }
 }
 
@@ -410 +428 @@
 RenderStyle *ElementImpl::styleForRenderer(RenderObject *parentRenderer)
 {
-    return getDocument()->styleSelector()->styleForElement(this);
+    DocumentImpl *doc = getDocument();
+    if (doc) {
+        return doc->styleSelector()->styleForElement(this);
+    }
+    else {
+        return 0;
+    }
 }
 
 RenderObject *ElementImpl::createRenderer(RenderArena *arena, RenderStyle *style)
 {
-    if (getDocument()->documentElement() == this && style->display() == NONE) {
+    DocumentImpl *doc = getDocument();
+    if (doc && doc->documentElement() == this && style->display() == NONE) {
         // Ignore display: none on root elements.  Force a display of block in that case.
         RenderBlock* result = new (arena) RenderBlock(this);
@@ -542 +567 @@
 
     // For XML documents, we are non-validating and do not check against a DTD, even for HTML elements.
-    if (getDocument()->isHTMLDocument())
-        return checkChild(id(), newChild->id(), !getDocument()->inCompatMode());
+    DocumentImpl *doc = getDocument();
+    if (doc && doc->isHTMLDocument()) {
+        return checkChild(id(), newChild->id(), !doc->inCompatMode());
+    }
     return true;
 }
@@ -565 +592 @@
 void ElementImpl::dispatchAttrRemovalEvent(AttributeImpl *attr)
 {
-    if (!getDocument()->hasListenerType(DocumentImpl::DOMATTRMODIFIED_LISTENER))
-    return;
+    DocumentImpl *doc = getDocument();
+    if (doc && !doc->hasListenerType(DocumentImpl::DOMATTRMODIFIED_LISTENER)) {
+        return;
+    }
     //int exceptioncode = 0;
 //     dispatchEvent(new MutationEventImpl(EventImpl::DOMATTRMODIFIED_EVENT,true,false,attr,attr->value(),
@@ -574 +603 @@
 void ElementImpl::dispatchAttrAdditionEvent(AttributeImpl *attr)
 {
-    if (!getDocument()->hasListenerType(DocumentImpl::DOMATTRMODIFIED_LISTENER))
-    return;
+    DocumentImpl *doc = getDocument();
+    if (doc && !doc->hasListenerType(DocumentImpl::DOMATTRMODIFIED_LISTENER)) {
+        return;
+    }
    // int exceptioncode = 0;
 //     dispatchEvent(new MutationEventImpl(EventImpl::DOMATTRMODIFIED_EVENT,true,false,attr,attr->value(),
@@ -642 +673 @@
 
     DocumentImpl* doc = getDocument();
-    if (!oldId.isEmpty())
-    doc->removeElementById(oldId, this);
-    if (!newId.isEmpty())
-    doc->addElementById(newId, this);
+    if (!oldId.isEmpty() && doc) {
+        doc->removeElementById(oldId, this);
+    }
+    if (!newId.isEmpty() && doc) {
+        doc->addElementById(newId, this);
+    }
 }
 
@@ -737 +770 @@
 DOMString XMLElementImpl::localName() const
 {
-    return getDocument()->tagName(m_id);
+    DocumentImpl *doc = getDocument();
+    if (doc) {
+        return doc->tagName(m_id);
+    }
+    else {
+        return DOMString();
+    }
 }
 
 DOMString XMLElementImpl::namespaceURI() const
 {
-    return getDocument()->namespaceURI(m_id);
+    DocumentImpl *doc = getDocument();
+    if (doc) {
+        return doc->namespaceURI(m_id);
+    }
+    else {
+        return DOMString();
+    }
 }
 
@@ -749 +794 @@
     // ### we loose namespace here FIXME
     // should pass id around
-    XMLElementImpl *clone = new XMLElementImpl(docPtr(), getDocument()->tagName(m_id).implementation());
+    DocumentImpl *doc = getDocument();
+    if (!doc) {
+        return 0;
+        }
+
+    XMLElementImpl *clone = new XMLElementImpl(docPtr(), doc->tagName(m_id).implementation());
     clone->m_id = m_id;
 
@@ -905 +955 @@
     assert(element);
     if (!element) return 0;
-    return element->getDocument()->attrId(namespaceURI.implementation(),
+    DocumentImpl *doc = element->getDocument();
+    if (!doc) return 0;
+    return doc->attrId(namespaceURI.implementation(),
                                             localName.implementation(), readonly);
 }