--- a/js/xpconnect/src/XPCWrappedNative.cpp
+++ b/js/xpconnect/src/XPCWrappedNative.cpp
@@ -2726,33 +2726,32 @@ CallMethodHelper::ConvertDependentParam(
         dp->SetIndirect();
 
     if (isArray) {
         if (NS_FAILED(mIFaceInfo->GetTypeForParam(mVTableIndex, &paramInfo, 1,
                                                   &datum_type))) {
             Throw(NS_ERROR_XPC_CANT_GET_ARRAY_INFO, mCallContext);
             return JS_FALSE;
         }
-    } else
+        if (datum_type.IsPointer())
+            dp->SetValNeedsCleanup();
+    } else {
         datum_type = type;
+    }
 
     if (datum_type.IsInterfacePointer()) {
         dp->SetValNeedsCleanup();
     }
 
     jsval src;
 
     if (!GetOutParamSource(i, &src))
         return JS_FALSE;
 
     if (paramInfo.IsOut()) {
-        if (datum_type.IsPointer() &&
-            isArray)
-            dp->SetValNeedsCleanup();
-
         if (!paramInfo.IsIn())
             return JS_TRUE;
     } else {
         NS_ASSERTION(i < mArgc || paramInfo.IsOptional(),
                      "Expected either enough arguments or an optional argument");
         src = i < mArgc ? mArgv[i] : JSVAL_NULL;
 
         if (datum_type.TagPart() == nsXPTType::T_IID ||