bits of Bug 1135773 - Initialize QI return values to null in the cycl…

…e collector. (rest was already part of 1119482
rmottola · Aug 8, 2019 · 6f30ef1 · 6f30ef1
1 parent 22d4578
commit 6f30ef1
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/xpcom/base/nsCycleCollector.cpp b/xpcom/base/nsCycleCollector.cpp
@@ -926,7 +926,7 @@ CCGraph::RemoveNodeFromMap(void* aPtr)
 static nsISupports*
 CanonicalizeXPCOMParticipant(nsISupports* aIn)
 {
-  nsISupports* out;
+  nsISupports* out = nullptr;
   aIn->QueryInterface(NS_GET_IID(nsCycleCollectionISupports),
                       reinterpret_cast<void**>(&out));
   return out;
@@ -1423,6 +1423,7 @@ ToParticipant(nsISupports* aPtr, nsXPCOMCycleCollectionParticipant** aCp)
   // nsXPCOMCycleCollectionParticipant, which is a per-class singleton helper
   // object that implements traversal and unlinking logic for the nsISupports
   // in question.
+  *aCp = nullptr;
   CallQueryInterface(aPtr, aCp);
 }