author | Neil Rashbrook <neil@parkwaycc.co.uk> |
Thu, 09 Jun 2011 21:15:10 +0100 | |
changeset 71017 | 10f50879c454482c0dbf5e9057d0a09b7afc0d54 |
parent 71016 | 3d68f32c68b74f632f95eaad1ab4433f50fe7473 |
child 71018 | f68c52f253e77c3787ccf05412490d9916b3009b |
push id | 20468 |
push user | eakhgari@mozilla.com |
push date | Tue, 14 Jun 2011 03:35:05 +0000 |
treeherder | mozilla-central@060127d32405 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | cjones |
bugs | 660535 |
milestone | 7.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
|
--- a/ipc/glue/GeckoChildProcessHost.cpp +++ b/ipc/glue/GeckoChildProcessHost.cpp @@ -378,25 +378,25 @@ GeckoChildProcessHost::PerformAsyncLaunc setChildLogName.Append(origLogName); // remember original value so we can restore it. // - buffer needs to be permanently allocated for PR_SetEnv() // - Note: this code is not called re-entrantly, nor are restoreOrigLogName // or mChildCounter touched by any other thread, so this is safe. static char* restoreOrigLogName = 0; if (!restoreOrigLogName) - restoreOrigLogName = strdup(PromiseFlatCString(setChildLogName).get()); + restoreOrigLogName = strdup(setChildLogName.get()); // Append child-specific postfix to name setChildLogName.AppendLiteral(".child-"); setChildLogName.AppendInt(++mChildCounter); // Passing temporary to PR_SetEnv is ok here because env gets copied // by exec, etc., to permanent storage in child when process launched. - PR_SetEnv(PromiseFlatCString(setChildLogName).get()); + PR_SetEnv(setChildLogName.get()); bool retval = PerformAsyncLaunchInternal(aExtraOpts, arch); // Revert to original value PR_SetEnv(restoreOrigLogName); return retval; }