forked from pool/MozillaFirefox
84ebf9d464
* MFSA 2012-57/CVE-2012-1970 Miscellaneous memory safety hazards * MFSA 2012-58/CVE-2012-1972/CVE-2012-1973/CVE-2012-1974/CVE-2012-1975 CVE-2012-1976/CVE-2012-3956/CVE-2012-3957/CVE-2012-3958/CVE-2012-3959 CVE-2012-3960/CVE-2012-3961/CVE-2012-3962/CVE-2012-3963/CVE-2012-3964 Use-after-free issues found using Address Sanitizer * MFSA 2012-59/CVE-2012-1956 (bmo#756719) Location object can be shadowed using Object.defineProperty * MFSA 2012-60/CVE-2012-3965 (bmo#769108) Escalation of privilege through about:newtab * MFSA 2012-61/CVE-2012-3966 (bmo#775794, bmo#775793) Memory corruption with bitmap format images with negative height * MFSA 2012-62/CVE-2012-3967/CVE-2012-3968 WebGL use-after-free and memory corruption * MFSA 2012-63/CVE-2012-3969/CVE-2012-3970 SVG buffer overflow and use-after-free issues * MFSA 2012-64/CVE-2012-3971 Graphite 2 memory corruption * MFSA 2012-65/CVE-2012-3972 (bmo#746855) Out-of-bounds read in format-number in XSLT * MFSA 2012-66/CVE-2012-3973 (bmo#757128) HTTPMonitor extension allows for remote debugging without explicit activation * MFSA 2012-68/CVE-2012-3975 (bmo#770684) DOMParser loads linked resources in extensions when parsing text/html * MFSA 2012-69/CVE-2012-3976 (bmo#768568) Incorrect site SSL certificate data display * MFSA 2012-70/CVE-2012-3978 (bmo#770429) OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=291
47 lines
1.5 KiB
Diff
47 lines
1.5 KiB
Diff
# HG changeset patch
|
|
# User Wolfgang Rosenauer <wr@rosenauer.org>
|
|
# Parent 07bb4ecfd6d6cc16360e7a32ee10b885d523f20d
|
|
Bug 762780 - crashreporter restart command should support MOZ_APP_LAUNCHER
|
|
|
|
diff --git a/toolkit/crashreporter/nsExceptionHandler.cpp b/toolkit/crashreporter/nsExceptionHandler.cpp
|
|
--- a/toolkit/crashreporter/nsExceptionHandler.cpp
|
|
+++ b/toolkit/crashreporter/nsExceptionHandler.cpp
|
|
@@ -1360,32 +1360,25 @@ nsresult
|
|
SetRestartArgs(int argc, char** argv)
|
|
{
|
|
if (!gExceptionHandler)
|
|
return NS_OK;
|
|
|
|
int i;
|
|
nsCAutoString envVar;
|
|
char *env;
|
|
+ char *argv1 = getenv("MOZ_APP_LAUNCHER");
|
|
for (i = 0; i < argc; i++) {
|
|
envVar = "MOZ_CRASHREPORTER_RESTART_ARG_";
|
|
envVar.AppendInt(i);
|
|
envVar += "=";
|
|
-#if defined(XP_UNIX) && !defined(XP_MACOSX)
|
|
- // we'd like to run the script around the binary
|
|
- // instead of the binary itself, so remove the -bin
|
|
- // if it exists on the first argument
|
|
- int arg_len = 0;
|
|
- if (i == 0 &&
|
|
- (arg_len = strlen(argv[i])) > 4 &&
|
|
- strcmp(argv[i] + arg_len - 4, "-bin") == 0) {
|
|
- envVar.Append(argv[i], arg_len - 4);
|
|
- } else
|
|
-#endif
|
|
- {
|
|
+ if (argv1 && i == 0) {
|
|
+ // Is there a request to suppress default binary launcher?
|
|
+ envVar += argv1;
|
|
+ } else {
|
|
envVar += argv[i];
|
|
}
|
|
|
|
// PR_SetEnv() wants the string to be available for the lifetime
|
|
// of the app, so dup it here
|
|
env = ToNewCString(envVar);
|
|
if (!env)
|
|
return NS_ERROR_OUT_OF_MEMORY;
|