From 6b918c131c966bb1b8de9593ab576e03557bdbd5 Mon Sep 17 00:00:00 2001 From: Olli Pettay Date: Wed, 16 Sep 2009 12:09:12 +0300 Subject: [PATCH] Bug 511487 - XSLT transformation fails with onload in FF3.6a1, r=peterv --- content/base/src/nsGenericElement.cpp | 4 +- content/xslt/tests/mochitest/Makefile.in | 1 + .../xslt/tests/mochitest/test_bug511487.html | 60 +++++++++++++++++++ 3 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 content/xslt/tests/mochitest/test_bug511487.html diff --git a/content/base/src/nsGenericElement.cpp b/content/base/src/nsGenericElement.cpp index 59a1b03ab15f..5b0b89eae20d 100644 --- a/content/base/src/nsGenericElement.cpp +++ b/content/base/src/nsGenericElement.cpp @@ -4281,7 +4281,9 @@ nsGenericElement::AddScriptEventListener(nsIAtom* aEventName, GetEventListenerManagerForAttr(getter_AddRefs(manager), getter_AddRefs(target), &defer); - NS_ENSURE_STATE(manager); + if (!manager) { + return NS_OK; + } defer = defer && aDefer; // only defer if everyone agrees... PRUint32 lang = GetScriptTypeID(); diff --git a/content/xslt/tests/mochitest/Makefile.in b/content/xslt/tests/mochitest/Makefile.in index efc348d1cf1f..f6e7ba727c1a 100644 --- a/content/xslt/tests/mochitest/Makefile.in +++ b/content/xslt/tests/mochitest/Makefile.in @@ -49,6 +49,7 @@ _TEST_FILES = test_bug319374.xhtml \ test_bug427060.html \ test_bug468208.html \ test_bug453441.html \ + test_bug511487.html \ $(NULL) libs:: $(_TEST_FILES) diff --git a/content/xslt/tests/mochitest/test_bug511487.html b/content/xslt/tests/mochitest/test_bug511487.html new file mode 100644 index 000000000000..e32f310827ee --- /dev/null +++ b/content/xslt/tests/mochitest/test_bug511487.html @@ -0,0 +1,60 @@ + + + + + Test for Bug 511487 + + + + + +Mozilla Bug 511487 +

+ +
+
+
+ +