Backed out 5 changesets (bug 1284897) for mozilla::SandboxPermissions…

…::RemovePermissionsForProcess crashes Backed out changeset 19b2fcee13a9 (bug 1284897) Backed out changeset a5171791437f (bug 1284897) Backed out changeset 3ea8b8a18515 (bug 1284897) Backed out changeset 21497a4e3bde (bug 1284897) Backed out changeset 12e17d5f0fa9 (bug 1284897)
dothq · Feb 17, 2017 · 87ae1a5 · 87ae1a5
1 parent ebddba2
commit 87ae1a5
Show file tree

Hide file tree

Showing 25 changed files with 196 additions and 1,267 deletions.
diff --git a/browser/app/nsBrowserApp.cpp b/browser/app/nsBrowserApp.cpp
@@ -217,16 +217,13 @@ static int do_main(int argc, char* argv[], char* envp[])
 #if defined(XP_WIN) && defined(MOZ_SANDBOX)
   sandbox::BrokerServices* brokerServices =
     sandboxing::GetInitializedBrokerServices();
-  sandboxing::PermissionsService* permissionsService =
-    sandboxing::GetPermissionsService();
 #if defined(MOZ_CONTENT_SANDBOX)
   if (!brokerServices) {
     Output("Couldn't initialize the broker services.\n");
     return 255;
   }
 #endif
   config.sandboxBrokerServices = brokerServices;
-  config.sandboxPermissionsService = permissionsService;
 #endif
 
 #ifdef LIBFUZZER

diff --git a/dom/plugins/ipc/PPluginModule.ipdl b/dom/plugins/ipc/PPluginModule.ipdl
@@ -14,9 +14,6 @@ using mozilla::dom::NativeThreadId from "mozilla/dom/TabMessageUtils.h";
 using class mac_plugin_interposing::NSCursorInfo from "mozilla/plugins/PluginMessageUtils.h";
 using struct nsID from "nsID.h";
 using struct mozilla::plugins::NPAudioDeviceChangeDetailsIPC from "mozilla/plugins/PluginMessageUtils.h";
-using mozilla::plugins::GetFileNameFunc from "mozilla/plugins/PluginMessageUtils.h";
-using mozilla::plugins::OpenFileNameIPC from "mozilla/plugins/PluginMessageUtils.h";
-using mozilla::plugins::OpenFileNameRetIPC from "mozilla/plugins/PluginMessageUtils.h";
 
 namespace mozilla {
 namespace plugins {
@@ -166,10 +163,6 @@ parent:
 
   intr NPN_SetValue_NPPVpluginRequiresAudioDeviceChanges(bool shouldRegister)
     returns (NPError result);
-
-  // Used to broker the GetOpenFileName/GetSaveFileName file pickers on Windows.
-  intr GetFileName(GetFileNameFunc aFunc, OpenFileNameIPC aOfnIn)
-    returns (OpenFileNameRetIPC aOfnOut, bool aResult);
 };
 
 } // namespace plugins

diff --git a/dom/plugins/ipc/PluginMessageUtils.cpp b/dom/plugins/ipc/PluginMessageUtils.cpp
@@ -151,192 +151,5 @@ void DeferNPVariantLastRelease(const NPNetscapeFuncs* f, NPVariant* v)
   VOID_TO_NPVARIANT(*v);
 }
 
-#ifdef XP_WIN
-void
-OpenFileNameIPC::CopyFromOfn(LPOPENFILENAMEW aLpofn)
-{
-  mHwndOwner = nullptr;
-
-  // Filter is double-NULL terminated.  mFilter should include the double-NULL.
-  mHasFilter = aLpofn->lpstrFilter != nullptr;
-  if (mHasFilter) {
-    uint32_t dNullIdx = 0;
-    while (aLpofn->lpstrFilter[dNullIdx] != L'\0' ||
-           aLpofn->lpstrFilter[dNullIdx+1] != L'\0') {
-      dNullIdx++;
-    }
-    mFilter.assign(aLpofn->lpstrFilter, dNullIdx+2);
-  }
-  mHasCustomFilter = aLpofn->lpstrCustomFilter != nullptr;
-  if (mHasCustomFilter) {
-    mCustomFilterIn = std::wstring(aLpofn->lpstrCustomFilter);
-    mNMaxCustFilterOut =
-      aLpofn->nMaxCustFilter - (wcslen(aLpofn->lpstrCustomFilter) + 1);
-  }
-  else {
-    mNMaxCustFilterOut = 0;
-  }
-  mFilterIndex = aLpofn->nFilterIndex;
-  mFile = std::wstring(aLpofn->lpstrFile);
-  mNMaxFile = aLpofn->nMaxFile;
-  mNMaxFileTitle =
-    aLpofn->lpstrFileTitle != nullptr ? aLpofn->nMaxFileTitle : 0;
-  mHasInitialDir = aLpofn->lpstrInitialDir != nullptr;
-  if (mHasInitialDir) {
-    mInitialDir = std::wstring(aLpofn->lpstrInitialDir);
-  }
-  mHasTitle = aLpofn->lpstrTitle != nullptr;
-  if (mHasTitle) {
-    mTitle = std::wstring(aLpofn->lpstrTitle);
-  }
-  mHasDefExt = aLpofn->lpstrDefExt != nullptr;
-  if (mHasDefExt) {
-    mDefExt = std::wstring(aLpofn->lpstrDefExt);
-  }
-
-  mFlags = aLpofn->Flags;
-  // If the user sets OFN_ALLOWMULTISELECT then we require OFN_EXPLORER
-  // as well.  Without OFN_EXPLORER, the method has ancient legacy
-  // behavior that we don't support.
-  MOZ_ASSERT((mFlags & OFN_EXPLORER) || !(mFlags & OFN_ALLOWMULTISELECT));
-
-  // We ignore any visual customization and callbacks that the user set.
-  mFlags &= ~(OFN_ENABLEHOOK | OFN_ENABLETEMPLATEHANDLE | OFN_ENABLETEMPLATE);
-
-  mFlagsEx = aLpofn->FlagsEx;
-}
-
-void
-OpenFileNameIPC::AddToOfn(LPOPENFILENAMEW aLpofn) const
-{
-  aLpofn->lStructSize = sizeof(OPENFILENAMEW);
-  aLpofn->hwndOwner = mHwndOwner;
-  if (mHasFilter) {
-    memcpy(const_cast<LPWSTR>(aLpofn->lpstrFilter),
-           mFilter.data(), mFilter.size() * sizeof(wchar_t));
-  }
-  if (mHasCustomFilter) {
-    aLpofn->nMaxCustFilter = mCustomFilterIn.size() + 1 + mNMaxCustFilterOut;
-    wcscpy(aLpofn->lpstrCustomFilter, mCustomFilterIn.c_str());
-    memset(aLpofn->lpstrCustomFilter + mCustomFilterIn.size() + 1, 0,
-           mNMaxCustFilterOut * sizeof(wchar_t));
-  }
-  else {
-    aLpofn->nMaxCustFilter = 0;
-  }
-  aLpofn->nFilterIndex = mFilterIndex;
-  wcscpy(aLpofn->lpstrFile, mFile.c_str());
-  aLpofn->nMaxFile = mNMaxFile;
-  aLpofn->nMaxFileTitle = mNMaxFileTitle;
-  if (mHasInitialDir) {
-    wcscpy(const_cast<LPWSTR>(aLpofn->lpstrInitialDir), mInitialDir.c_str());
-  }
-  if (mHasTitle) {
-    wcscpy(const_cast<LPWSTR>(aLpofn->lpstrTitle), mTitle.c_str());
-  }
-  aLpofn->Flags = mFlags;  /* TODO: Consider adding OFN_NOCHANGEDIR */
-  if (mHasDefExt) {
-    wcscpy(const_cast<LPWSTR>(aLpofn->lpstrDefExt), mDefExt.c_str());
-  }
-  aLpofn->FlagsEx = mFlagsEx;
-}
-
-void
-OpenFileNameIPC::AllocateOfnStrings(LPOPENFILENAMEW aLpofn) const
-{
-  if (mHasFilter) {
-    // mFilter is double-NULL terminated and it includes the double-NULL in its length.
-    aLpofn->lpstrFilter =
-      static_cast<LPCTSTR>(moz_xmalloc(sizeof(wchar_t) * (mFilter.size())));
-  }
-  if (mHasCustomFilter) {
-    aLpofn->lpstrCustomFilter =
-      static_cast<LPTSTR>(moz_xmalloc(sizeof(wchar_t) * (mCustomFilterIn.size() + 1) + mNMaxCustFilterOut));
-  }
-  aLpofn->lpstrFile =
-    static_cast<LPTSTR>(moz_xmalloc(sizeof(wchar_t) * mNMaxFile));
-  if (mNMaxFileTitle > 0) {
-    aLpofn->lpstrFileTitle =
-      static_cast<LPTSTR>(moz_xmalloc(sizeof(wchar_t) * mNMaxFileTitle));
-  }
-  if (mHasInitialDir) {
-    aLpofn->lpstrInitialDir =
-      static_cast<LPCTSTR>(moz_xmalloc(sizeof(wchar_t) * (mInitialDir.size() + 1)));
-  }
-  if (mHasTitle) {
-    aLpofn->lpstrTitle =
-      static_cast<LPCTSTR>(moz_xmalloc(sizeof(wchar_t) * (mTitle.size() + 1)));
-  }
-  if (mHasDefExt) {
-    aLpofn->lpstrDefExt =
-      static_cast<LPCTSTR>(moz_xmalloc(sizeof(wchar_t) * (mDefExt.size() + 1)));
-  }
-}
-
-void
-OpenFileNameIPC::FreeOfnStrings(LPOPENFILENAMEW aLpofn) const
-{
-  if (aLpofn->lpstrFilter) {
-    free(const_cast<LPWSTR>(aLpofn->lpstrFilter));
-  }
-  if (aLpofn->lpstrCustomFilter) {
-    free(aLpofn->lpstrCustomFilter);
-  }
-  if (aLpofn->lpstrFile) {
-    free(aLpofn->lpstrFile);
-  }
-  if (aLpofn->lpstrFileTitle) {
-    free(aLpofn->lpstrFileTitle);
-  }
-  if (aLpofn->lpstrInitialDir) {
-    free(const_cast<LPWSTR>(aLpofn->lpstrInitialDir));
-  }
-  if (aLpofn->lpstrTitle) {
-    free(const_cast<LPWSTR>(aLpofn->lpstrTitle));
-  }
-  if (aLpofn->lpstrDefExt) {
-    free(const_cast<LPWSTR>(aLpofn->lpstrDefExt));
-  }
-}
-
-void
-OpenFileNameRetIPC::CopyFromOfn(LPOPENFILENAMEW aLpofn)
-{
-  if (aLpofn->lpstrCustomFilter != nullptr) {
-    mCustomFilterOut =
-      std::wstring(aLpofn->lpstrCustomFilter + wcslen(aLpofn->lpstrCustomFilter) + 1);
-  }
-  mFile.assign(aLpofn->lpstrFile, aLpofn->nMaxFile);
-  if (aLpofn->lpstrFileTitle != nullptr) {
-    mFileTitle.assign(aLpofn->lpstrFileTitle, wcslen(aLpofn->lpstrFileTitle) + 1);
-  }
-  mFileOffset = aLpofn->nFileOffset;
-  mFileExtension = aLpofn->nFileExtension;
-}
-
-void
-OpenFileNameRetIPC::AddToOfn(LPOPENFILENAMEW aLpofn) const
-{
-  if (aLpofn->lpstrCustomFilter) {
-    LPWSTR secondString =
-      aLpofn->lpstrCustomFilter + wcslen(aLpofn->lpstrCustomFilter) + 1;
-    const wchar_t* customFilterOut = mCustomFilterOut.c_str();
-    MOZ_ASSERT(wcslen(aLpofn->lpstrCustomFilter) + 1 +
-               wcslen(customFilterOut) + 1 + 1 <= aLpofn->nMaxCustFilter);
-    wcscpy(secondString, customFilterOut);
-    secondString[wcslen(customFilterOut) + 1] = L'\0';  // terminated with two NULLs
-  }
-  MOZ_ASSERT(mFile.size() <= aLpofn->nMaxFile);
-  memcpy(aLpofn->lpstrFile,
-         mFile.data(), mFile.size() * sizeof(wchar_t));
-  if (aLpofn->lpstrFileTitle != nullptr) {
-    MOZ_ASSERT(mFileTitle.size() + 1 < aLpofn->nMaxFileTitle);
-    wcscpy(aLpofn->lpstrFileTitle, mFileTitle.c_str());
-  }
-  aLpofn->nFileOffset = mFileOffset;
-  aLpofn->nFileExtension = mFileExtension;
-}
-#endif  // XP_WIN
-
 } // namespace plugins
 } // namespace mozilla