Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-30 10:12:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1045847 - Fix review comments

Browse Source
This commit is contained in:
Bill McCloskey 2014-08-08 17:55:22 -07:00
parent c2b34b4534
commit 99080fa9fb
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ipc/contentproc/plugin-container.cpp
View File

@ -85,8 +85,9 @@ content_process_main(int argc, char* argv[])
{
// Check for the absolute minimum number of args we need to move
// forward here. We expect the last arg to be the child process type.
if (argc < 1)
if (argc < 1) {
return 3;
}
XRE_SetProcessType(argv[--argc]);
bool isNuwa = false;

6
toolkit/xre/nsEmbedFunctions.cpp
View File

@ -213,6 +213,12 @@ GeckoProcessType sChildProcessType = GeckoProcessType_Default;
void
XRE_SetProcessType(const char* aProcessTypeString)
{
static bool called = false;
if (called) {
MOZ_CRASH();
}
called = true;
sChildProcessType = GeckoProcessType_Invalid;
for (int i = 0;
i < (int) ArrayLength(kGeckoProcessTypeString);