diff --git a/content/base/crashtests/564114.html b/content/base/crashtests/564114.html new file mode 100644 index 000000000000..93786e222117 --- /dev/null +++ b/content/base/crashtests/564114.html @@ -0,0 +1,11 @@ + + + + + + + diff --git a/content/base/crashtests/crashtests.list b/content/base/crashtests/crashtests.list index 0287e0181d3a..cfdd8eca1b08 100644 --- a/content/base/crashtests/crashtests.list +++ b/content/base/crashtests/crashtests.list @@ -64,3 +64,4 @@ asserts(1) load 554230-1.xhtml # bug 336104 load 552651.html load 558973.html load 564079-1.html +load 564114.html diff --git a/content/base/src/nsGenericElement.cpp b/content/base/src/nsGenericElement.cpp index 55485f0fb35d..7f05bf8f7893 100644 --- a/content/base/src/nsGenericElement.cpp +++ b/content/base/src/nsGenericElement.cpp @@ -999,11 +999,8 @@ nsNode3Tearoff::CompareDocumentPosition(nsIDOMNode* aOther, PRUint16* aReturn) { nsCOMPtr other = do_QueryInterface(aOther); - NS_ENSURE_ARG(other); - *aReturn = mNode->CompareDocumentPosition(other); - - return NS_OK; + return mNode->CompareDocumentPosition(other, aReturn); } NS_IMETHODIMP diff --git a/js/src/xpconnect/src/dom_quickstubs.qsconf b/js/src/xpconnect/src/dom_quickstubs.qsconf index a8be2d5ddaa3..f084299c7dd2 100644 --- a/js/src/xpconnect/src/dom_quickstubs.qsconf +++ b/js/src/xpconnect/src/dom_quickstubs.qsconf @@ -723,9 +723,7 @@ customMethodCalls = { }, 'nsIDOM3Node_CompareDocumentPosition': { 'thisType': 'nsINode', - 'arg0Type': 'nsINode', - 'code': ' PRUint16 result = self->CompareDocumentPosition(arg0);', - 'canFail': False + 'arg0Type': 'nsINode' }, 'nsIDOM3Node_GetTextContent': { 'thisType': 'nsINode',