summaryrefslogtreecommitdiffstats
path: root/chrome/nacl
diff options
context:
space:
mode:
authorjschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-02 20:13:26 +0000
committerjschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-02 20:13:26 +0000
commit89b2312b5aca51da726b93e966842ffd5f642402 (patch)
tree1d971d0c9005452ac115e37f831e8aa5c67ac0a6 /chrome/nacl
parent9208de7ee3590c34a135ca0298c2618779064f69 (diff)
downloadchromium_src-89b2312b5aca51da726b93e966842ffd5f642402.zip
chromium_src-89b2312b5aca51da726b93e966842ffd5f642402.tar.gz
chromium_src-89b2312b5aca51da726b93e966842ffd5f642402.tar.bz2
Hook GetUserDefaultLCID () to prevent crashes on attempting to connect to CSRSS after lockdown.
BUG=91216 TEST=None. Review URL: http://codereview.chromium.org/7541034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95144 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/nacl')
-rw-r--r--chrome/nacl/nacl_main_platform_delegate_win.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/nacl/nacl_main_platform_delegate_win.cc b/chrome/nacl/nacl_main_platform_delegate_win.cc
index 75b3dc9..aba8481 100644
--- a/chrome/nacl/nacl_main_platform_delegate_win.cc
+++ b/chrome/nacl/nacl_main_platform_delegate_win.cc
@@ -66,6 +66,9 @@ void NaClMainPlatformDelegate::EnableSandbox() {
// Cause advapi32 to load before the sandbox is turned on.
unsigned int dummy_rand;
rand_s(&dummy_rand);
+ // Warm up language subsystems before the sandbox is turned on.
+ ::GetUserDefaultLangID();
+ ::GetUserDefaultLCID();
// Turn the sandbox on.
target_services->LowerToken();
}