Bug 1024943 - Check IsContentParent() before use AsContentParent(). r=smaug

dom/ipc/TabParent.cpp

@@ -984,11 +984,13 @@ TabParent::RecvSyncMessage(const nsString& aMessage,
 {
   // FIXME Permission check for TabParent in Content process
   nsIPrincipal* principal = aPrincipal;
+  if (Manager()->IsContentParent()) {
     ContentParent* parent = Manager()->AsContentParent();
     if (!ContentParent::IgnoreIPCPrincipal() &&
         parent && principal && !AssertAppPrincipal(parent, principal)) {
       return false;
     }
+  }
 
   StructuredCloneData cloneData = ipc::UnpackClonedMessageDataForParent(aData);
   CpowIdHolder cpows(Manager()->GetCPOWManager(), aCpows);
@@ -1004,11 +1006,13 @@ TabParent::AnswerRpcMessage(const nsString& aMessage,
 {
   // FIXME Permission check for TabParent in Content process
   nsIPrincipal* principal = aPrincipal;
+  if (Manager()->IsContentParent()) {
     ContentParent* parent = Manager()->AsContentParent();
     if (!ContentParent::IgnoreIPCPrincipal() &&
         parent && principal && !AssertAppPrincipal(parent, principal)) {
       return false;
     }
+  }
 
   StructuredCloneData cloneData = ipc::UnpackClonedMessageDataForParent(aData);
   CpowIdHolder cpows(Manager()->GetCPOWManager(), aCpows);
@@ -1023,11 +1027,13 @@ TabParent::RecvAsyncMessage(const nsString& aMessage,
 {
   // FIXME Permission check for TabParent in Content process
   nsIPrincipal* principal = aPrincipal;
+  if (Manager()->IsContentParent()) {
     ContentParent* parent = Manager()->AsContentParent();
     if (!ContentParent::IgnoreIPCPrincipal() &&
         parent && principal && !AssertAppPrincipal(parent, principal)) {
       return false;
     }
+  }
 
   StructuredCloneData cloneData = ipc::UnpackClonedMessageDataForParent(aData);
   CpowIdHolder cpows(Manager()->GetCPOWManager(), aCpows);

dom/ipc/nsIContentParent.cpp

@@ -236,11 +236,13 @@ nsIContentParent::RecvSyncMessage(const nsString& aMsg,
 {
   // FIXME Permission check in Content process
   nsIPrincipal* principal = aPrincipal;
+  if (IsContentParent()) {
     ContentParent* parent = AsContentParent();
     if (!ContentParent::IgnoreIPCPrincipal() &&
         parent && principal && !AssertAppPrincipal(parent, principal)) {
       return false;
     }
+  }
 
   nsRefPtr<nsFrameMessageManager> ppm = mMessageManager;
   if (ppm) {
@@ -262,11 +264,13 @@ nsIContentParent::AnswerRpcMessage(const nsString& aMsg,
 {
   // FIXME Permission check in Content process
   nsIPrincipal* principal = aPrincipal;
+  if (IsContentParent()) {
     ContentParent* parent = AsContentParent();
     if (!ContentParent::IgnoreIPCPrincipal() &&
         parent && principal && !AssertAppPrincipal(parent, principal)) {
       return false;
     }
+  }
 
   nsRefPtr<nsFrameMessageManager> ppm = mMessageManager;
   if (ppm) {
@@ -286,11 +290,13 @@ nsIContentParent::RecvAsyncMessage(const nsString& aMsg,
 {
   // FIXME Permission check in Content process
   nsIPrincipal* principal = aPrincipal;
+  if (IsContentParent()) {
     ContentParent* parent = AsContentParent();
     if (!ContentParent::IgnoreIPCPrincipal() &&
         parent && principal && !AssertAppPrincipal(parent, principal)) {
       return false;
     }
+  }
 
   nsRefPtr<nsFrameMessageManager> ppm = mMessageManager;
   if (ppm) {