Bug 504423 ReadAnnotationEntry leaks key if nsCStringKey sets rv to failure

r=dveditz

--HG--
extra : rebase_source : 07b5d1d19d7533f1a620ab8a83f19b20f33ec6fc

caps/src/nsPrincipal.cpp

@@ -1061,7 +1061,11 @@ ReadAnnotationEntry(nsIObjectInputStream* aStream, nsHashKey** aKey,
 {
   nsresult rv;
   nsCStringKey* key = new nsCStringKey(aStream, &rv);
+  if (!key)
+    return NS_ERROR_OUT_OF_MEMORY;
+
   if (NS_FAILED(rv)) {
+    delete key;
     return rv;
   }