Bug 564079. Check that we have a parent before checking whether it's …

…an Element. r=peterv
leto · May 6, 2010 · 490ac49 · 490ac49
1 parent 09691f1
commit 490ac49
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/content/base/crashtests/564079-1.html b/content/base/crashtests/564079-1.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+<head>
+<script type="text/javascript">
+
+document.createTextNode("x").lookupPrefix("");
+
+</script>
+</head>
+</html>
diff --git a/content/base/crashtests/crashtests.list b/content/base/crashtests/crashtests.list
@@ -63,3 +63,4 @@ load 529670.html
 load 554230-1.xhtml
 load 552651.html
 load 558973.html
+load 564079-1.html 
diff --git a/content/base/src/nsGenericDOMDataNode.h b/content/base/src/nsGenericDOMDataNode.h
@@ -286,7 +286,7 @@ class nsGenericDOMDataNode : public nsIContent
   {
     nsINode *parent = GetNodeParent();
 
-    return parent->IsElement() ? parent->AsElement() : nsnull;
+    return parent && parent->IsElement() ? parent->AsElement() : nsnull;
   }
 
   /**