Changeset 93910 in vbox for trunk/src/libs/xpcom18a4/ipc/ipcd/extensions

Timestamp:

Feb 24, 2022 10:45:13 AM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

150136

Message:

xpcom18a4/ipcDConnectService.cpp: Assert when returning NS_ERROR_INVALID_POINTER. bugref:9898

File:

• trunk/src/libs/xpcom18a4/ipc/ipcd/extensions/dconnect/src/ipcDConnectService.cpp (modified) (9 diffs)

trunk/src/libs/xpcom18a4/ipc/ipcd/extensions/dconnect/src/ipcDConnectService.cpp

@@ -374 +374 @@
     case nsXPTType::T_IID:
       {
-        if (v.val.p)
-          writer.PutBytes(v.val.p, sizeof(nsID));
-        else
-          return NS_ERROR_INVALID_POINTER;
+        AssertReturn(v.val.p, NS_ERROR_INVALID_POINTER);
+        writer.PutBytes(v.val.p, sizeof(nsID));
       }
       break;
@@ -1883 +1881 @@
 NS_IMETHODIMP ExceptionStub::GetMessage(char **aMessage)
 {
-  if (!aMessage)
-    return NS_ERROR_INVALID_POINTER;
+  AssertReturn(aMessage, NS_ERROR_INVALID_POINTER);
   *aMessage = ToNewCString(mMessage);
   return NS_OK;
@@ -1892 +1889 @@
 NS_IMETHODIMP ExceptionStub::GetResult(nsresult *aResult)
 {
-  if (!aResult)
-    return NS_ERROR_INVALID_POINTER;
+  AssertReturn(aResult, NS_ERROR_INVALID_POINTER);
   *aResult = mResult;
   return NS_OK;
@@ -1901 +1897 @@
 NS_IMETHODIMP ExceptionStub::GetName(char **aName)
 {
-  if (!aName)
-    return NS_ERROR_INVALID_POINTER;
+  AssertReturn(aName, NS_ERROR_INVALID_POINTER);
   *aName = ToNewCString(mName);
   return NS_OK;
@@ -1910 +1905 @@
 NS_IMETHODIMP ExceptionStub::GetFilename(char **aFilename)
 {
-  if (!aFilename)
-    return NS_ERROR_INVALID_POINTER;
+  AssertReturn(aFilename, NS_ERROR_INVALID_POINTER);
   *aFilename = ToNewCString(mFilename);
   return NS_OK;
@@ -1919 +1913 @@
 NS_IMETHODIMP ExceptionStub::GetLineNumber(PRUint32 *aLineNumber)
 {
-  if (!aLineNumber)
-    return NS_ERROR_INVALID_POINTER;
+  AssertReturn(aLineNumber, NS_ERROR_INVALID_POINTER);
   *aLineNumber = mLineNumber;
   return NS_OK;
@@ -1928 +1921 @@
 NS_IMETHODIMP ExceptionStub::GetColumnNumber(PRUint32 *aColumnNumber)
 {
-  if (!aColumnNumber)
-    return NS_ERROR_INVALID_POINTER;
+  AssertReturn(aColumnNumber, NS_ERROR_INVALID_POINTER);
   *aColumnNumber = mColumnNumber;
   return NS_OK;
@@ -2590 +2582 @@
         rv = SerializeParam(writer, type, aParams[i]);
 
-      if (NS_FAILED(rv))
-        break;
+      AssertMsgBreak(NS_SUCCEEDED(rv), ("i=%d rv=%#x\n", i, rv));
     }
     else if ((paramInfo.IsOut() || paramInfo.IsRetval()) && !aParams[i].val.p)
@@ -2597 +2588 @@
       // report error early if NULL pointer is passed as an output parameter
       rv = NS_ERROR_NULL_POINTER;
+      AssertMsgFailedBreak(("i=%d IsOut=%d IsRetval=%d NS_ERROR_NULL_POINTER\n", i, paramInfo.IsOut(), paramInfo.IsRetval()));
       break;
     }