Changeset 61543 in vbox for trunk/src/libs/xpcom18a4/xpcom/reflect/xptcall

Timestamp:

Jun 7, 2016 2:41:41 PM (9 years ago)

Author:

vboxsync

Message:

addendum to r19249, r104674, r107879: unify these checks for all stubs we are using

Location:

trunk/src/libs/xpcom18a4/xpcom/reflect/xptcall/src/md

Files:

• os2/xptcstubs_gcc_x86_os2.cpp (modified) (2 diffs)
• unix/xptcstubs_amd64_darwin.cpp (modified) (1 diff)
• unix/xptcstubs_gcc_x86_unix.cpp (modified) (2 diffs)
• unix/xptcstubs_unixish_x86.cpp (modified) (3 diffs)
• unix/xptcstubs_x86_64_linux.cpp (modified) (1 diff)
• unix/xptcstubs_x86_solaris.cpp (modified) (1 diff)

trunk/src/libs/xpcom18a4/xpcom/reflect/xptcall/src/md/os2/xptcstubs_gcc_x86_os2.cpp

@@ -65 +65 @@
     self->GetInterfaceInfo(&iface_info);
     NS_ASSERTION(iface_info,"no interface info");
+    if (!iface_info)
+        return NS_ERROR_UNEXPECTED;
 
     iface_info->GetMethodInfo(PRUint16(methodIndex), &info);
-    NS_ASSERTION(info,"no interface info");
-
-#ifdef VBOX
+    NS_ASSERTION(info,"no method info");
     if (!info)
-        return result;
-#endif
+        return NS_ERROR_UNEXPECTED;
 
     paramCount = info->GetParamCount();
@@ -82 +81 @@
         dispatchParams = paramBuffer;
     NS_ASSERTION(dispatchParams,"no place for params");
+    if (!dispatchParams)
+        return NS_ERROR_OUT_OF_MEMORY;
 
     PRUint32* ap = args;

trunk/src/libs/xpcom18a4/xpcom/reflect/xptcall/src/md/unix/xptcstubs_amd64_darwin.cpp

@@ -67 +67 @@
     nsXPTCMiniVariant* dispatchParams = NULL;
     nsIInterfaceInfo* iface_info = NULL;
-    const nsXPTMethodInfo* info;
+    const nsXPTMethodInfo* info = NULL;
     PRUint32 paramCount;
     PRUint32 i;

trunk/src/libs/xpcom18a4/xpcom/reflect/xptcall/src/md/unix/xptcstubs_gcc_x86_unix.cpp

@@ -67 +67 @@
 
     iface_info->GetMethodInfo(PRUint16(methodIndex), &info);
-    NS_ASSERTION(info,"no interface info");
-
-#ifdef VBOX
+    NS_ASSERTION(info,"no method info");
     if (!info)
-        return result;
-#endif
+        return NS_ERROR_UNEXPECTED;
 
     paramCount = info->GetParamCount();
@@ -82 +79 @@
         dispatchParams = paramBuffer;
     NS_ASSERTION(dispatchParams,"no place for params");
+    if (!dispatchParams)
+        return NS_ERROR_OUT_OF_MEMORY;
 
     PRUint32* ap = args;

trunk/src/libs/xpcom18a4/xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_x86.cpp

@@ -50 +50 @@
     nsXPTCMiniVariant* dispatchParams = NULL;
     nsIInterfaceInfo* iface_info = NULL;
-    const nsXPTMethodInfo* info;
+    const nsXPTMethodInfo* info = NULL;
     PRUint8 paramCount;
     PRUint8 i;
@@ -59 +59 @@
     self->GetInterfaceInfo(&iface_info);
     NS_ASSERTION(iface_info,"no interface info");
+    if (!iface_info)
+        return NS_ERROR_UNEXPECTED;
 
     iface_info->GetMethodInfo(PRUint16(methodIndex), &info);
-    NS_ASSERTION(info,"no interface info");
+    NS_ASSERTION(info,"no method info");
+    if (!info)
+        return NS_ERROR_UNEXPECTED;
 
     paramCount = info->GetParamCount();
@@ -71 +75 @@
         dispatchParams = paramBuffer;
     NS_ASSERTION(dispatchParams,"no place for params");
+    if (!dispatchParams)
+        return NS_ERROR_OUT_OF_MEMORY;
 
     PRUint32* ap = args;

trunk/src/libs/xpcom18a4/xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_64_linux.cpp

@@ -67 +67 @@
     nsXPTCMiniVariant* dispatchParams = NULL;
     nsIInterfaceInfo* iface_info = NULL;
-    const nsXPTMethodInfo* info;
+    const nsXPTMethodInfo* info = NULL;
     PRUint32 paramCount;
     PRUint32 i;

trunk/src/libs/xpcom18a4/xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_solaris.cpp

@@ -50 +50 @@
     nsXPTCMiniVariant* dispatchParams = NULL;
     nsIInterfaceInfo* iface_info = NULL;
-    const nsXPTMethodInfo* info;
+    const nsXPTMethodInfo* info = NULL;
     PRUint8 paramCount;
     PRUint8 i;