Fix for bug 564114 (Crash [@ nsINode::CompareDocumentPosition] passing null). r=bz.

2010-05-06 21:26:35 +02:00 · 2010-05-06 21:26:35 +02:00 · b3668213b6
--- a/content/base/crashtests/564114.html
+++ b/content/base/crashtests/564114.html
@ -0,0 +1,11 @@
+<html>
+<head>
+<script type="text/javascript">
+
+document.documentElement.compareDocumentPosition(null);
+
+</script>
+</head>
+
+<body></body>
+</html>
--- 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
--- a/content/base/src/nsGenericElement.cpp
+++ b/content/base/src/nsGenericElement.cpp
@ -999,11 +999,8 @@ nsNode3Tearoff::CompareDocumentPosition(nsIDOMNode* aOther,
                                        PRUint16* aReturn)
 {
  nsCOMPtr<nsINode> other = do_QueryInterface(aOther);
-  NS_ENSURE_ARG(other);

-  *aReturn = mNode->CompareDocumentPosition(other);
-
-  return NS_OK;
+  return mNode->CompareDocumentPosition(other, aReturn);
 }

 NS_IMETHODIMP
--- 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',