Bug 347183 - frozen-linkage access to null/singleton/union/array enumerators, r=darin

Author: benjamin%smedbergs.us

mailnews/addrbook/src/nsAbLDAPDirFactory.cpp

@@ -128,8 +128,7 @@ NS_IMETHODIMP nsAbLDAPDirFactory::CreateDirectory(nsIAbDirectoryProperties *aPro
     rv = directory->SetDirPrefId(prefName);
     NS_ENSURE_SUCCESS(rv, rv);
 
-    NS_IF_ADDREF(*aDirectories = new nsSingletonEnumerator(directory));
-    return *aDirectories ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
+    return NS_NewSingletonEnumerator(aDirectories, directory);
 }
 
 /* void deleteDirectory (in nsIAbDirectory directory); */

mailnews/addrbook/src/nsAbLDAPDirectory.cpp

@@ -59,6 +59,7 @@
 #include "nsIPrefBranch.h"
 #include "nsCOMArray.h"
 #include "nsArrayEnumerator.h"
+#include "nsEnumeratorUtils.h"
 #include "nsIAbLDAPAttributeMap.h"
 
 nsAbLDAPDirectory::nsAbLDAPDirectory() :

mailnews/addrbook/src/nsAbMDBDirFactory.cpp

@@ -179,12 +179,7 @@ NS_IMETHODIMP nsAbMDBDirFactory::CreateDirectory(nsIAbDirectoryProperties *aProp
     rv = RemoveMailListDBListeners (listDatabase, directory);
     NS_ENSURE_SUCCESS(rv, rv);
 
-    nsSingletonEnumerator* cursor =    new nsSingletonEnumerator(directory);
-    if(!cursor)
-        return NS_ERROR_NULL_POINTER;
-    
-    NS_IF_ADDREF(*_retval = cursor);
-    return rv;
+    return NS_NewSingletonEnumerator(_retval, directory);
 }
 
 

mailnews/addrbook/src/nsDirectoryDataSource.cpp

@@ -240,14 +240,8 @@ NS_IMETHODIMP nsAbDirectoryDataSource::GetTargets(nsIRDFResource* source,
       (kNC_IsSecure == property) ||
       (kNC_IsWriteable == property) ||
       (kNC_DirTreeNameSort == property)) 
-    { 
-      nsSingletonEnumerator* cursor =
-        new nsSingletonEnumerator(property);
-      if (cursor == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-      NS_ADDREF(cursor);
-      *targets = cursor;
-      return NS_OK;
+    {
+      return NS_NewSingletonEnumerator(targets, property);
     }
   }
   return NS_NewEmptyEnumerator(targets);
@@ -319,15 +313,7 @@ NS_IMETHODIMP nsAbDirectoryDataSource::ArcLabelsOut(nsIRDFResource* source,
     NS_NewISupportsArray(getter_AddRefs(arcs));
   }
 
-  nsArrayEnumerator* cursor =
-    new nsArrayEnumerator(arcs);
-  
-  if (cursor == nsnull)
-    return NS_ERROR_OUT_OF_MEMORY;
-  NS_ADDREF(cursor);
-  *labels = cursor;
-  
-  return NS_OK;
+  return NS_NewArrayEnumerator(labels, arcs);
 }
 
 nsresult

mailnews/base/search/src/nsMsgFilterDataSource.cpp

@@ -125,12 +125,7 @@ nsMsgFilterDataSource::GetTargets(nsIRDFResource *aSource,
 
     if (NS_FAILED(rv)) {
         // no filter delegate
-        nsSingletonEnumerator *cursor = new nsSingletonEnumerator(nsnull);
-        NS_ENSURE_TRUE(cursor, NS_ERROR_OUT_OF_MEMORY);
-        
-        *aResult = cursor;
-        NS_ADDREF(*aResult);
-        return NS_OK;
+        return NS_NewSingletonEnumerator(aResult, nsnull);
     }
 
 
@@ -162,12 +157,7 @@ nsMsgFilterDataSource::GetTargets(nsIRDFResource *aSource,
         }
     }
 
-    nsArrayEnumerator *cursor = new nsArrayEnumerator(resourceList);
-    NS_ENSURE_TRUE(cursor, NS_ERROR_OUT_OF_MEMORY);
-    
-    *aResult = cursor;
-    NS_ADDREF(*aResult);
-    return NS_OK;
+    return NS_NewArrayEnumerator(aResult, resourceList);
 }
 
 NS_IMETHODIMP
@@ -259,14 +249,7 @@ nsMsgFilterDataSource::ArcLabelsOut(nsIRDFResource *aSource,
         return NS_RDF_NO_VALUE;
     }
 
-    nsArrayEnumerator* enumerator =
-        new nsArrayEnumerator(arcs);
-    NS_ENSURE_TRUE(enumerator, NS_ERROR_OUT_OF_MEMORY);
-  
-    *aResult = enumerator;
-    NS_ADDREF(*aResult);
-
-    return NS_OK;
+    return NS_NewArrayEnumerator(aResult, arcs);
 }
 
 // takes a base resource, like mailbox://username@host/folder and returns

mailnews/base/src/nsMsgFolderDataSource.cpp

@@ -534,13 +534,7 @@ NS_IMETHODIMP nsMsgFolderDataSource::GetTargets(nsIRDFResource* source,
       (kNC_SyncDisabled == property) ||
       (kNC_CanSearchMessages == property))
     {
-      nsSingletonEnumerator* cursor =
-        new nsSingletonEnumerator(property);
-      if (cursor == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-      NS_ADDREF(cursor);
-      *targets = cursor;
-      rv = NS_OK;
+      return NS_NewSingletonEnumerator(targets, property);
     }
   }
   if(!*targets)
@@ -2375,11 +2369,7 @@ NS_IMETHODIMP nsMsgFlatFolderDataSource::GetTargets(nsIRDFResource* source,
       return NS_NewArrayEnumerator(targets, allFolders);
     }
   }
-  nsSingletonEnumerator* cursor = new nsSingletonEnumerator(property);
-  if (cursor == nsnull)
-    return NS_ERROR_OUT_OF_MEMORY;
-  NS_ADDREF(*targets = cursor);
-  return NS_OK;
+  return NS_NewSingletonEnumerator(targets, property);
 }
 
 

mailnews/base/src/nsSubscribeDataSource.cpp

@@ -266,13 +266,7 @@ nsSubscribeDataSource::GetChildren(nsISubscribableServer *aServer,
     // GetChildren() can fail if there are no children
     if (NS_FAILED(rv)) return rv;
 
-    nsISimpleEnumerator* result = new nsArrayEnumerator(children);
-    if (!result) return NS_ERROR_OUT_OF_MEMORY;
-
-    NS_ADDREF(result);
-    *aResult = result;
-
-    return NS_OK;
+    return NS_NewArrayEnumerator(aResult, children);
 }
 
 NS_IMETHODIMP
@@ -324,45 +318,31 @@ nsSubscribeDataSource::GetTargets(nsIRDFResource *source,
         rv = mRDFService->GetLiteral(leafNameStr, getter_AddRefs(leafName));
         NS_ENSURE_SUCCESS(rv,rv);
 
-        nsISimpleEnumerator* result = new nsSingletonEnumerator(leafName);
-        if (!result) return NS_ERROR_OUT_OF_MEMORY;
-
-        NS_IF_ADDREF(*targets = result);
-        return NS_OK;
+        return NS_NewSingletonEnumerator(targets, leafName);
     }
     else if (property == kNC_Subscribed.get()) {
         PRBool isSubscribed;
         rv = server->IsSubscribed(relativePath, &isSubscribed);
         NS_ENSURE_SUCCESS(rv,rv);
 
-        nsISimpleEnumerator* result = new nsSingletonEnumerator(isSubscribed ? kTrueLiteral : kFalseLiteral);
-        if (!result) return NS_ERROR_OUT_OF_MEMORY;
-
-        NS_IF_ADDREF(*targets = result);
-        return NS_OK;
+        return NS_NewSingletonEnumerator(targets,
+                 isSubscribed ? kTrueLiteral : kFalseLiteral);
     }
     else if (property == kNC_Subscribable.get()) {
         PRBool isSubscribable;
         rv = server->IsSubscribable(relativePath, &isSubscribable);
         NS_ENSURE_SUCCESS(rv,rv);
 
-        nsISimpleEnumerator* result = new nsSingletonEnumerator(isSubscribable ? kTrueLiteral : kFalseLiteral);
-        if (!result) return NS_ERROR_OUT_OF_MEMORY;
-
-        NS_IF_ADDREF(*targets = result);
-        return NS_OK;
+        return NS_NewSingletonEnumerator(targets,
+                 isSubscribable ? kTrueLiteral : kFalseLiteral);
     }
     else if (property == kNC_Name.get()) {
         nsCOMPtr<nsIRDFLiteral> name;
         rv = mRDFService->GetLiteral(NS_ConvertUTF8toUTF16(relativePath).get(),
                                      getter_AddRefs(name));
         NS_ENSURE_SUCCESS(rv,rv);
 
-        nsISimpleEnumerator* result = new nsSingletonEnumerator(name);
-        if (!result) return NS_ERROR_OUT_OF_MEMORY;
-
-        NS_IF_ADDREF(*targets = result);
-        return NS_OK;
+        return NS_NewSingletonEnumerator(targets, name);
     }
     else if (property == kNC_ServerType.get()) {
         nsXPIDLCString serverTypeStr;
@@ -374,11 +354,7 @@ nsSubscribeDataSource::GetTargets(nsIRDFResource *source,
                                      getter_AddRefs(serverType));
         NS_ENSURE_SUCCESS(rv,rv);
 
-        nsISimpleEnumerator* result = new nsSingletonEnumerator(serverType);
-        if (!result) return NS_ERROR_OUT_OF_MEMORY;
-
-        NS_IF_ADDREF(*targets = result);
-        return NS_OK;
+        return NS_NewSingletonEnumerator(targets, serverType);
     }
     else {
         // do nothing
@@ -647,12 +623,7 @@ nsSubscribeDataSource::ArcLabelsOut(nsIRDFResource *source,
         array->AppendElement(kNC_Child);
     }
 
-    nsISimpleEnumerator* result = new nsArrayEnumerator(array);
-    if (! result) return NS_ERROR_OUT_OF_MEMORY;
-
-    NS_ADDREF(result);
-    *labels = result;
-    return NS_OK;
+    return NS_NewArrayEnumerator(labels, array);
 }
 
 NS_IMETHODIMP

rdf/base/src/nsInMemoryDataSource.cpp

@@ -1789,12 +1789,7 @@ InMemoryDataSource::GetAllResources(nsISimpleEnumerator** aResult)
     // Enumerate all of our entries into an nsISupportsArray.
     PL_DHashTableEnumerate(&mForwardArcs, ResourceEnumerator, values.get());
 
-    *aResult = new nsArrayEnumerator(values);
-    if (! *aResult)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    NS_ADDREF(*aResult);
-    return NS_OK;
+    return NS_NewArrayEnumerator(aResult, values);
 }
 
 NS_IMETHODIMP

rdf/datasource/src/nsFileSystemDataSource.cpp

@@ -522,17 +522,10 @@ FileSystemDataSource::GetTargets(nsIRDFResource *source,
         }
         else if (property == mNC_pulse)
         {
-            nsIRDFLiteral   *pulseLiteral;
-            mRDFService->GetLiteral(NS_LITERAL_STRING("12").get(), &pulseLiteral);
-            nsISimpleEnumerator* result = new nsSingletonEnumerator(pulseLiteral);
-            NS_RELEASE(pulseLiteral);
-
-            if (! result)
-                return NS_ERROR_OUT_OF_MEMORY;
-
-            NS_ADDREF(result);
-            *targets = result;
-            return NS_OK;
+            nsCOMPtr<nsIRDFLiteral> pulseLiteral;
+            mRDFService->GetLiteral(NS_LITERAL_STRING("12").get(),
+                                    getter_AddRefs(pulseLiteral));
+            return NS_NewSingletonEnumerator(targets, pulseLiteral);
         }
     }
     else if (isFileURI(source))
@@ -547,27 +540,15 @@ FileSystemDataSource::GetTargets(nsIRDFResource *source,
             rv = GetName(source, getter_AddRefs(name));
             if (NS_FAILED(rv)) return rv;
 
-            nsISimpleEnumerator* result = new nsSingletonEnumerator(name);
-            if (! result)
-                return NS_ERROR_OUT_OF_MEMORY;
-
-            NS_ADDREF(result);
-            *targets = result;
-            return NS_OK;
+            return NS_NewSingletonEnumerator(targets, name);
         }
         else if (property == mNC_URL)
         {
             nsCOMPtr<nsIRDFLiteral> url;
             rv = GetURL(source, nsnull, getter_AddRefs(url));
             if (NS_FAILED(rv)) return rv;
 
-            nsISimpleEnumerator* result = new nsSingletonEnumerator(url);
-            if (! result)
-                return NS_ERROR_OUT_OF_MEMORY;
-
-            NS_ADDREF(result);
-            *targets = result;
-            return NS_OK;
+            return NS_NewSingletonEnumerator(targets, url);
         }
         else if (property == mRDF_type)
         {
@@ -581,14 +562,7 @@ FileSystemDataSource::GetTargets(nsIRDFResource *source,
             rv = mRDFService->GetLiteral(url.get(), getter_AddRefs(literal));
             if (NS_FAILED(rv)) return rv;
 
-            nsISimpleEnumerator* result = new nsSingletonEnumerator(literal);
-
-            if (! result)
-                return NS_ERROR_OUT_OF_MEMORY;
-
-            NS_ADDREF(result);
-            *targets = result;
-            return NS_OK;
+            return NS_NewSingletonEnumerator(targets, literal);
         }
         else if (property == mNC_pulse)
         {
@@ -597,14 +571,7 @@ FileSystemDataSource::GetTargets(nsIRDFResource *source,
                 getter_AddRefs(pulseLiteral));
             if (NS_FAILED(rv)) return rv;
 
-            nsISimpleEnumerator* result = new nsSingletonEnumerator(pulseLiteral);
-
-            if (! result)
-                return NS_ERROR_OUT_OF_MEMORY;
-
-            NS_ADDREF(result);
-            *targets = result;
-            return NS_OK;
+            return NS_NewSingletonEnumerator(targets, pulseLiteral);
         }
     }
 
@@ -815,13 +782,7 @@ FileSystemDataSource::ArcLabelsOut(nsIRDFResource *source,
         array->AppendElement(mNC_Child);
         array->AppendElement(mNC_pulse);
 
-        nsISimpleEnumerator* result = new nsArrayEnumerator(array);
-        if (! result)
-            return NS_ERROR_OUT_OF_MEMORY;
-
-        NS_ADDREF(result);
-        *labels = result;
-        return NS_OK;
+        return NS_NewArrayEnumerator(labels, array);
     }
     else if (isFileURI(source))
     {
@@ -842,13 +803,7 @@ FileSystemDataSource::ArcLabelsOut(nsIRDFResource *source,
             array->AppendElement(mNC_pulse);
         }
 
-        nsISimpleEnumerator* result = new nsArrayEnumerator(array);
-        if (! result)
-            return NS_ERROR_OUT_OF_MEMORY;
-
-        NS_ADDREF(result);
-        *labels = result;
-        return NS_OK;
+        return NS_NewArrayEnumerator(labels, array);
     }
 
     return NS_NewEmptyEnumerator(labels);
@@ -1041,14 +996,7 @@ FileSystemDataSource::GetVolumeList(nsISimpleEnumerator** aResult)
     }
 #endif
 
-    nsISimpleEnumerator* result = new nsArrayEnumerator(volumes);
-    if (! result)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    NS_ADDREF(result);
-    *aResult = result;
-
-    return NS_OK;
+    return NS_NewArrayEnumerator(aResult, volumes);
 }
 
 
@@ -1226,18 +1174,9 @@ FileSystemDataSource::GetFolderList(nsIRDFResource *source, PRBool allowHidden,
             break;
     }
 
-    nsISimpleEnumerator* result = new nsArrayEnumerator(nameArray);
-    if (! result)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    NS_ADDREF(result);
-    *aResult = result;
-
-    return NS_OK;
+    return NS_NewArrayEnumerator(aResult, nameArray);
 }
 
-
-
 nsresult
 FileSystemDataSource::GetLastMod(nsIRDFResource *source, nsIRDFDate **aResult)
 {