Bug 824581 - RemoteOpenFileChild::AsyncRemoteFileOpen crashes on Windows/Mac r=jduell
authorBobby Holley <bobbyholley@gmail.com>
Wed, 26 Dec 2012 11:01:00 -0800
changeset 126381 418baef1894a00ca05743cfbce131b1179bad372
parent 126380 c0ba38205c41bc1d010cdc0254b1b2d69e2db654
child 126382 8dc63fc43d1a7bd1fd734dcaea9ea589e9ef9f1a
push id2151
push userlsblakk@mozilla.com
push dateTue, 19 Feb 2013 18:06:57 +0000
treeherdermozilla-beta@4952e88741ec [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjduell
bugs824581
milestone20.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 824581 - RemoteOpenFileChild::AsyncRemoteFileOpen crashes on Windows/Mac r=jduell
modules/libjar/test/unit/xpcshell.ini
netwerk/ipc/RemoteOpenFileChild.cpp
--- a/modules/libjar/test/unit/xpcshell.ini
+++ b/modules/libjar/test/unit/xpcshell.ini
@@ -1,15 +1,15 @@
 [DEFAULT]
 head = head_ipc.js
 tail = 
 
 [test_jarchannel.js]
 [test_jarchannel_e10s.js]
-skip-if = os == "mac" || os == "win"
+skip-if = os == "mac"
 [test_bug278262.js]
 [test_bug333423.js]
 [test_bug336691.js]
 [test_bug370103.js]
 [test_bug379841.js]
 [test_bug407303.js]
 [test_bug453254.js]
 [test_bug458158.js]
--- a/netwerk/ipc/RemoteOpenFileChild.cpp
+++ b/netwerk/ipc/RemoteOpenFileChild.cpp
@@ -103,23 +103,21 @@ RemoteOpenFileChild::AsyncRemoteFileOpen
   }
 
   mozilla::dom::TabChild* tabChild = nullptr;
   if (aTabChild) {
     tabChild = static_cast<mozilla::dom::TabChild*>(aTabChild);
   }
 
 #if defined(XP_WIN) || defined(MOZ_WIDGET_COCOA)
-  // we do nothing on these platforms: we'll just open file locally when asked
-  // for NSPR handle
-  mListener->OnRemoteFileOpenComplete(NS_OK);
-  mListener = nullptr;
+  // Windows/OSX desktop builds skip remoting, and just open file in child
+  // process when asked for NSPR handle
+  aListener->OnRemoteFileOpenComplete(NS_OK);
   mAsyncOpenCalled = true;
   return NS_OK;
-
 #else
   URIParams uri;
   SerializeURI(mURI, uri);
 
   gNeckoChild->SendPRemoteOpenFileConstructor(this, uri, tabChild);
 
   // Can't seem to reply from within IPDL Parent constructor, so send open as
   // separate message