435033 - -override is not passed to spawned process on EM restart

Status: RESOLVED FIXED

(Toolkit Graveyard :: XULRunner, defect)

Description

[Matthew Gertner]

When an app is run with -override and requires EM restart, the -override parameter is not passed to the new process.

Comment 1

[Matthew Gertner]

Attachment: Add override flag back to command line for restart

Seems like the overridden properties are needed before other args get processed/remove, so I add it back to gRestartArgv explicitly.

Comment 2

[Matthew Gertner]

Attachment: Use gRestartArgc instead of gArgc and allocate enough space for override params

Comment 3

[Benjamin Smedberg]

Comment on attachment 330005 [details] [diff] [review]
Use gRestartArgc instead of gArgc and allocate enough space for override params

>Index: toolkit/xre/nsAppRunner.cpp

>+static char gOverrideFlag[] = "-override";

I know you're doing this because of const-ness, but please don't... instead see below.

>+  // Add the -override argument back (it is removed automatically be CheckArg) if there is one
>+  if (override) {
>+    gRestartArgv[gRestartArgc++] = gOverrideFlag;

gRestartArgv[gRestartArgc++] = const_cast<char*>("-override");

>+    gRestartArgv[gRestartArgc++] = (char *) override;

Please use const_cast instead of C-style casts.

All else this is fine.

Comment 4

[Matthew Gertner]

Attachment: Use const_cast

Comment 5

[Matthew Gertner]

Attachment: Use const_cast (correct version)

Comment 6

[Dave Townsend [:mossop]]

Landed: http://hg.mozilla.org/index.cgi/mozilla-central/rev/b2a93e3558c0