зеркало из https://github.com/mozilla/pjs.git
Bug 552864 part 1 - Move DLL blocklist in XRE, and inline NS_SetDllDirectory and environment sanitization, which now needs to be called manually. r=ehsan,r=bsmedberg
This commit is contained in:
Родитель
43ad97fa1f
Коммит
eb6869881b
|
@ -54,8 +54,6 @@
|
|||
#include "nsStringGlue.h"
|
||||
|
||||
#ifdef XP_WIN
|
||||
// we want to use the DLL blocklist if possible
|
||||
#define XRE_WANT_DLL_BLOCKLIST
|
||||
// we want a wmain entry point
|
||||
#include "nsWindowsWMain.cpp"
|
||||
#endif
|
||||
|
@ -110,6 +108,10 @@ int main(int argc, char* argv[])
|
|||
{
|
||||
ScopedLogging log;
|
||||
|
||||
#ifdef XRE_HAS_DLL_BLOCKLIST
|
||||
XRE_SetupDllBlocklist();
|
||||
#endif
|
||||
|
||||
nsCOMPtr<nsILocalFile> appini;
|
||||
nsresult rv = XRE_GetBinaryPath(argv[0], getter_AddRefs(appini));
|
||||
if (NS_FAILED(rv)) {
|
||||
|
|
|
@ -110,6 +110,7 @@ PluginProcessChild::Init()
|
|||
protectCurrentDirectory = false;
|
||||
}
|
||||
if (protectCurrentDirectory) {
|
||||
SanitizeEnvironmentVariables();
|
||||
NS_SetDllDirectory(L"");
|
||||
}
|
||||
|
||||
|
|
|
@ -73,6 +73,7 @@ main(int argc, char* argv[])
|
|||
// avoid it for unsupported plugins. See PluginProcessChild::Init for
|
||||
// the details.
|
||||
if (proctype != GeckoProcessType_Plugin) {
|
||||
mozilla::SanitizeEnvironmentVariables();
|
||||
mozilla::NS_SetDllDirectory(L"");
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -95,6 +95,7 @@ endif
|
|||
|
||||
ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
|
||||
CPPSRCS += nsNativeAppSupportWin.cpp
|
||||
CPPSRCS += nsWindowsDllBlocklist.cpp
|
||||
DEFINES += -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE
|
||||
EXPORTS = nsWindowsDllInterceptor.h
|
||||
else
|
||||
|
|
|
@ -40,6 +40,12 @@
|
|||
|
||||
#include <stdio.h>
|
||||
|
||||
#ifdef XRE_WANT_DLL_BLOCKLIST
|
||||
#define XRE_SetupDllBlocklist SetupDllBlocklist
|
||||
#else
|
||||
#include "nsXULAppAPI.h"
|
||||
#endif
|
||||
|
||||
#include "nsAutoPtr.h"
|
||||
|
||||
#include "prlog.h"
|
||||
|
@ -208,7 +214,7 @@ continue_loading:
|
|||
WindowsDllInterceptor NtDllIntercept;
|
||||
|
||||
void
|
||||
SetupDllBlocklist()
|
||||
XRE_SetupDllBlocklist()
|
||||
{
|
||||
NtDllIntercept.Init("ntdll.dll");
|
||||
|
||||
|
|
|
@ -76,6 +76,7 @@ FreeAllocStrings(int argc, char **argv)
|
|||
int wmain(int argc, WCHAR **argv)
|
||||
{
|
||||
#ifndef XRE_DONT_PROTECT_DLL_LOAD
|
||||
mozilla::SanitizeEnvironmentVariables();
|
||||
mozilla::NS_SetDllDirectory(L"");
|
||||
#endif
|
||||
|
||||
|
|
|
@ -98,7 +98,6 @@ EXPORTS_mozilla = \
|
|||
$(NULL)
|
||||
|
||||
ifeq (windows,$(MOZ_WIDGET_TOOLKIT))
|
||||
CPPSRCS += nsSetDllDirectory.cpp
|
||||
CPPSRCS += nsCrashOnException.cpp
|
||||
endif
|
||||
|
||||
|
|
|
@ -1,91 +0,0 @@
|
|||
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
/* ***** BEGIN LICENSE BLOCK *****
|
||||
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
*
|
||||
* The contents of this file are subject to the Mozilla Public License Version
|
||||
* 1.1 (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
* http://www.mozilla.org/MPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
* for the specific language governing rights and limitations under the
|
||||
* License.
|
||||
*
|
||||
* The Original Code is mozilla.org code.
|
||||
*
|
||||
* The Initial Developer of the Original Code is
|
||||
* Mozilla Foundation.
|
||||
* Portions created by the Initial Developer are Copyright (C) 2010
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
* Ehsan Akhgari <ehsan@mozilla.com> (Original Author)
|
||||
*
|
||||
* Alternatively, the contents of this file may be used under the terms of
|
||||
* either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
* in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
* of those above. If you wish to allow use of your version of this file only
|
||||
* under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
* use your version of this file under the terms of the MPL, indicate your
|
||||
* decision by deleting the provisions above and replace them with the notice
|
||||
* and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
* the provisions above, a recipient may use your version of this file under
|
||||
* the terms of any one of the MPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
#ifndef XP_WIN
|
||||
#error This file only makes sense on Windows.
|
||||
#endif
|
||||
|
||||
#include <windows.h>
|
||||
#include <stdlib.h>
|
||||
#include "nsSetDllDirectory.h"
|
||||
|
||||
void
|
||||
SanitizeEnvironmentVariables()
|
||||
{
|
||||
DWORD bufferSize = GetEnvironmentVariableW(L"PATH", NULL, 0);
|
||||
if (bufferSize) {
|
||||
wchar_t* originalPath = new wchar_t[bufferSize];
|
||||
if (bufferSize - 1 == GetEnvironmentVariableW(L"PATH", originalPath, bufferSize)) {
|
||||
bufferSize = ExpandEnvironmentStringsW(originalPath, NULL, 0);
|
||||
if (bufferSize) {
|
||||
wchar_t* newPath = new wchar_t[bufferSize];
|
||||
if (ExpandEnvironmentStringsW(originalPath,
|
||||
newPath,
|
||||
bufferSize)) {
|
||||
SetEnvironmentVariableW(L"PATH", newPath);
|
||||
}
|
||||
delete[] newPath;
|
||||
}
|
||||
}
|
||||
delete[] originalPath;
|
||||
}
|
||||
}
|
||||
|
||||
namespace mozilla {
|
||||
|
||||
XPCOM_API(void)
|
||||
NS_SetDllDirectory(const WCHAR *aDllDirectory)
|
||||
{
|
||||
typedef BOOL
|
||||
(WINAPI *pfnSetDllDirectory) (LPCWSTR);
|
||||
static pfnSetDllDirectory setDllDirectory = nsnull;
|
||||
if (!setDllDirectory) {
|
||||
setDllDirectory = reinterpret_cast<pfnSetDllDirectory>
|
||||
(GetProcAddress(GetModuleHandleW(L"kernel32.dll"), "SetDllDirectoryW"));
|
||||
|
||||
// If it's the first time we're running this function, sanitize the
|
||||
// environment variables too.
|
||||
SanitizeEnvironmentVariables();
|
||||
}
|
||||
if (setDllDirectory) {
|
||||
setDllDirectory(aDllDirectory);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -43,13 +43,48 @@
|
|||
#error This file only makes sense on Windows.
|
||||
#endif
|
||||
|
||||
#include <windows.h>
|
||||
#include <nscore.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
namespace mozilla {
|
||||
|
||||
static void SanitizeEnvironmentVariables()
|
||||
{
|
||||
DWORD bufferSize = GetEnvironmentVariableW(L"PATH", NULL, 0);
|
||||
if (bufferSize) {
|
||||
wchar_t* originalPath = new wchar_t[bufferSize];
|
||||
if (bufferSize - 1 == GetEnvironmentVariableW(L"PATH", originalPath, bufferSize)) {
|
||||
bufferSize = ExpandEnvironmentStringsW(originalPath, NULL, 0);
|
||||
if (bufferSize) {
|
||||
wchar_t* newPath = new wchar_t[bufferSize];
|
||||
if (ExpandEnvironmentStringsW(originalPath,
|
||||
newPath,
|
||||
bufferSize)) {
|
||||
SetEnvironmentVariableW(L"PATH", newPath);
|
||||
}
|
||||
delete[] newPath;
|
||||
}
|
||||
}
|
||||
delete[] originalPath;
|
||||
}
|
||||
}
|
||||
|
||||
// Sets the directory from which DLLs can be loaded if the SetDllDirectory OS
|
||||
// API is available.
|
||||
XPCOM_API(void) NS_SetDllDirectory(const WCHAR *aDllDirectory);
|
||||
// You must call SanitizeEnvironmentVariables before this function when calling
|
||||
// it the first time.
|
||||
static inline void NS_SetDllDirectory(const WCHAR *aDllDirectory)
|
||||
{
|
||||
typedef BOOL
|
||||
(WINAPI *pfnSetDllDirectory) (LPCWSTR);
|
||||
pfnSetDllDirectory setDllDirectory = nsnull;
|
||||
setDllDirectory = reinterpret_cast<pfnSetDllDirectory>
|
||||
(GetProcAddress(GetModuleHandleW(L"kernel32.dll"), "SetDllDirectoryW"));
|
||||
if (setDllDirectory) {
|
||||
setDllDirectory(aDllDirectory);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -281,7 +281,6 @@ void XXXNeverCalled()
|
|||
sXPCOMHasLoadedNewDLLs = !sXPCOMHasLoadedNewDLLs;
|
||||
NS_SetHasLoadedNewDLLs();
|
||||
NS_NewWindowsRegKey(nsnull);
|
||||
NS_SetDllDirectory(nsnull);
|
||||
#if defined (DEBUG)
|
||||
PurePrintf(0);
|
||||
#endif
|
||||
|
|
|
@ -562,4 +562,11 @@ XRE_API(bool,
|
|||
|
||||
XRE_API(void,
|
||||
XRE_InstallX11ErrorHandler, ())
|
||||
|
||||
#if defined(_MSC_VER) && defined(_M_IX86)
|
||||
#define XRE_HAS_DLL_BLOCKLIST
|
||||
XRE_API(void,
|
||||
XRE_SetupDllBlocklist, ())
|
||||
#endif
|
||||
|
||||
#endif // _nsXULAppAPI_h__
|
||||
|
|
Загрузка…
Ссылка в новой задаче