Bug 1179250 - Make implementation of GetInterface return NS_ERROR_NO_INTERFACE on error.r=valentin

Differential Revision: https://phabricator.services.mozilla.com/D68607

--HG--
extra : moz-landing-system : lando

Author: mahakbansal2019

netwerk/base/nsPACMan.cpp

@@ -850,8 +850,13 @@ nsPACMan::GetInterface(const nsIID& iid, void** result) {
   if (iid.Equals(NS_GET_IID(nsIAuthPrompt))) {
     nsCOMPtr<nsIPromptFactory> promptFac =
         do_GetService("@mozilla.org/prompter;1");
-    NS_ENSURE_TRUE(promptFac, NS_ERROR_FAILURE);
-    return promptFac->GetPrompt(nullptr, iid, reinterpret_cast<void**>(result));
+    NS_ENSURE_TRUE(promptFac, NS_ERROR_NO_INTERFACE);
+    nsresult rv =
+        promptFac->GetPrompt(nullptr, iid, reinterpret_cast<void**>(result));
+    if (NS_FAILED(rv)) {
+      return NS_ERROR_NO_INTERFACE;
+    }
+    return NS_OK;
   }
 
   // In case loading the PAC file results in a redirect.

netwerk/protocol/ftp/FTPChannelParent.cpp

@@ -550,8 +550,12 @@ FTPChannelParent::GetInterface(const nsIID& uuid, void** result) {
              uuid.Equals(NS_GET_IID(nsIAuthPrompt2))) {
     nsCOMPtr<nsIAuthPromptProvider> provider(do_QueryObject(mBrowserParent));
     if (provider) {
-      return provider->GetAuthPrompt(nsIAuthPromptProvider::PROMPT_NORMAL, uuid,
-                                     result);
+      nsresult rv = provider->GetAuthPrompt(
+          nsIAuthPromptProvider::PROMPT_NORMAL, uuid, result);
+      if (NS_FAILED(rv)) {
+        return NS_ERROR_NO_INTERFACE;
+      }
+      return NS_OK;
     }
   }
 

netwerk/protocol/http/HttpChannelParent.cpp

@@ -309,19 +309,23 @@ HttpChannelParent::GetInterface(const nsIID& aIID, void** result) {
     nsresult rv;
     nsCOMPtr<nsIWindowWatcher> wwatch =
         do_GetService(NS_WINDOWWATCHER_CONTRACTID, &rv);
-    NS_ENSURE_SUCCESS(rv, rv);
+    NS_ENSURE_SUCCESS(rv, NS_ERROR_NO_INTERFACE);
 
     bool hasWindowCreator = false;
     Unused << wwatch->HasWindowCreator(&hasWindowCreator);
     if (!hasWindowCreator) {
-      return NS_ERROR_FAILURE;
+      return NS_ERROR_NO_INTERFACE;
     }
 
     nsCOMPtr<nsIPromptFactory> factory = do_QueryInterface(wwatch);
     if (!factory) {
       return NS_ERROR_NO_INTERFACE;
     }
-    return factory->GetPrompt(nullptr, aIID, reinterpret_cast<void**>(result));
+    rv = factory->GetPrompt(nullptr, aIID, reinterpret_cast<void**>(result));
+    if (NS_FAILED(rv)) {
+      return NS_ERROR_NO_INTERFACE;
+    }
+    return NS_OK;
   }
 
   // Only support nsILoadContext if child channel's callbacks did too

netwerk/protocol/http/ParentChannelListener.cpp

@@ -166,20 +166,20 @@ ParentChannelListener::GetInterface(const nsIID& aIID, void** result) {
         mBrowsingContext->Top()->GetEmbedderElement();
     if (frameElement) {
       nsCOMPtr<nsPIDOMWindowOuter> win = frameElement->OwnerDoc()->GetWindow();
-      NS_ENSURE_TRUE(win, NS_ERROR_UNEXPECTED);
+      NS_ENSURE_TRUE(win, NS_ERROR_NO_INTERFACE);
 
       nsresult rv;
       nsCOMPtr<nsIWindowWatcher> wwatch =
           do_GetService(NS_WINDOWWATCHER_CONTRACTID, &rv);
 
       if (NS_WARN_IF(!NS_SUCCEEDED(rv))) {
-        return rv;
+        return NS_ERROR_NO_INTERFACE;
       }
 
       nsCOMPtr<nsIPrompt> prompt;
       rv = wwatch->GetNewPrompter(win, getter_AddRefs(prompt));
       if (NS_WARN_IF(!NS_SUCCEEDED(rv))) {
-        return rv;
+        return NS_ERROR_NO_INTERFACE;
       }
 
       prompt.forget(result);
@@ -189,7 +189,12 @@ ParentChannelListener::GetInterface(const nsIID& aIID, void** result) {
 
   if (mBrowsingContext && (aIID.Equals(NS_GET_IID(nsIAuthPrompt)) ||
                            aIID.Equals(NS_GET_IID(nsIAuthPrompt2)))) {
-    return GetAuthPrompt(nsIAuthPromptProvider::PROMPT_NORMAL, aIID, result);
+    nsresult rv =
+        GetAuthPrompt(nsIAuthPromptProvider::PROMPT_NORMAL, aIID, result);
+    if (NS_FAILED(rv)) {
+      return NS_ERROR_NO_INTERFACE;
+    }
+    return NS_OK;
   }
 
   nsCOMPtr<nsIInterfaceRequestor> ir;

netwerk/protocol/websocket/WebSocketChannel.cpp

@@ -3031,7 +3031,7 @@ WebSocketChannel::GetInterface(const nsIID& iid, void** result) {
 
   if (mCallbacks) return mCallbacks->GetInterface(iid, result);
 
-  return NS_ERROR_FAILURE;
+  return NS_ERROR_NO_INTERFACE;
 }
 
 // nsIChannelEventSink

netwerk/protocol/websocket/WebSocketChannelParent.cpp

@@ -274,9 +274,14 @@ void WebSocketChannelParent::ActorDestroy(ActorDestroyReason why) {
 NS_IMETHODIMP
 WebSocketChannelParent::GetInterface(const nsIID& iid, void** result) {
   LOG(("WebSocketChannelParent::GetInterface() %p\n", this));
-  if (mAuthProvider && iid.Equals(NS_GET_IID(nsIAuthPromptProvider)))
-    return mAuthProvider->GetAuthPrompt(nsIAuthPromptProvider::PROMPT_NORMAL,
-                                        iid, result);
+  if (mAuthProvider && iid.Equals(NS_GET_IID(nsIAuthPromptProvider))) {
+    nsresult rv = mAuthProvider->GetAuthPrompt(
+        nsIAuthPromptProvider::PROMPT_NORMAL, iid, result);
+    if (NS_FAILED(rv)) {
+      return NS_ERROR_NO_INTERFACE;
+    }
+    return NS_OK;
+  }
 
   // Only support nsILoadContext if child channel's callbacks did too
   if (iid.Equals(NS_GET_IID(nsILoadContext)) && mLoadContext) {