From bc4d80925c9c92444b4442749cc06d90a9792730 Mon Sep 17 00:00:00 2001
From: Chris Pearce <chris@pearce.org.nz>
Date: Wed, 23 Sep 2009 13:58:00 +1200
Subject: [PATCH] Bug 492286 - Null check in nsHTMLSourceElement::BindToTree().
r=roc
---
content/html/content/src/nsHTMLSourceElement.cpp | 2 +-
content/media/test/crashtests/492286-1.xhtml | 1 +
content/media/test/crashtests/crashtests.list | 2 ++
3 files changed, 4 insertions(+), 1 deletion(-)
create mode 100644 content/media/test/crashtests/492286-1.xhtml
diff --git a/content/html/content/src/nsHTMLSourceElement.cpp b/content/html/content/src/nsHTMLSourceElement.cpp
index 47a01c4ee3021..6df18cd24d735 100644
--- a/content/html/content/src/nsHTMLSourceElement.cpp
+++ b/content/html/content/src/nsHTMLSourceElement.cpp
@@ -145,7 +145,7 @@ nsHTMLSourceElement::BindToTree(nsIDocument *aDocument,
aCompileEventHandlers);
NS_ENSURE_SUCCESS(rv, rv);
- if (!aParent->IsNodeOfType(nsINode::eMEDIA))
+ if (!aParent || !aParent->IsNodeOfType(nsINode::eMEDIA))
return NS_OK;
nsHTMLMediaElement* media = static_cast<nsHTMLMediaElement*>(aParent);
diff --git a/content/media/test/crashtests/492286-1.xhtml b/content/media/test/crashtests/492286-1.xhtml
new file mode 100644
index 0000000000000..627ac38723ce7
--- /dev/null
+++ b/content/media/test/crashtests/492286-1.xhtml
@@ -0,0 +1 @@
+<source xmlns="http://www.w3.org/1999/xhtml"/>
\ No newline at end of file
diff --git a/content/media/test/crashtests/crashtests.list b/content/media/test/crashtests/crashtests.list
index 67892021520e8..8639722761593 100644
--- a/content/media/test/crashtests/crashtests.list
+++ b/content/media/test/crashtests/crashtests.list
@@ -4,3 +4,5 @@ load 468763-1.html
load 474744-1.html
load 493915-1.html
load 495794-1.html
+load 492286-1.xhtml
+
--
GitLab