--- a/js/xpconnect/src/XPCWrappedNative.cpp
+++ b/js/xpconnect/src/XPCWrappedNative.cpp
@@ -2727,35 +2727,35 @@ CallMethodHelper::ConvertDependentParam(
     bool isSizedString = isArray ?
         JS_FALSE :
         type.TagPart() == nsXPTType::T_PSTRING_SIZE_IS ||
         type.TagPart() == nsXPTType::T_PWSTRING_SIZE_IS;
 
     nsXPTCVariant* dp = GetDispatchParam(i);
     dp->type = type;
 
-    // Specify the correct storage/calling semantics.
-    if (paramInfo.IsIndirect())
-        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;
         }
-        if (datum_type.IsPointer())
-            dp->SetValNeedsCleanup();
     } else {
         datum_type = type;
     }
 
-    if (datum_type.IsInterfacePointer()) {
+    // Specify the correct storage/calling semantics.
+    if (paramInfo.IsIndirect())
+        dp->SetIndirect();
+
+    if (isArray && datum_type.IsPointer())
         dp->SetValNeedsCleanup();
-    }
+
+    if (datum_type.IsInterfacePointer())
+        dp->SetValNeedsCleanup();
 
     // Even if there's nothing to convert, we still need to examine the
     // JSObject container for out-params. If it's null or otherwise invalid,
     // we want to know before the call, rather than after.
     //
     // This is a no-op for 'in' params.
     jsval src;
     if (!GetOutParamSource(i, &src))