summaryrefslogtreecommitdiff
path: root/www/firefox/files/patch-bug1233275
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--www/firefox/files/patch-bug123327536
1 files changed, 0 insertions, 36 deletions
diff --git a/www/firefox/files/patch-bug1233275 b/www/firefox/files/patch-bug1233275
deleted file mode 100644
index ac5d9d2cdedb..000000000000
--- a/www/firefox/files/patch-bug1233275
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copy environment for IPC using NSPR to avoid race
-
-diff --git a/ipc/chromium/src/base/process_util_bsd.cc b/ipc/chromium/src/base/process_util_bsd.cc
---- ipc/chromium/src/base/process_util_bsd.cc
-+++ ipc/chromium/src/base/process_util_bsd.cc
-@@ -12,10 +12,9 @@
-
- #include <string>
-
-+#include "nspr.h"
- #include "base/eintr_wrapper.h"
-
--extern "C" char **environ __attribute__((__visibility__("default")));
--
- namespace base {
-
- void FreeEnvVarsArray(char* array[], int length)
-@@ -66,6 +65,7 @@ bool LaunchApp(const std::vector<std::st
- // Existing variables are overwritten by env_vars_to_set.
- int pos = 0;
- environment_map combined_env_vars = env_vars_to_set;
-+ char **environ = PR_DuplicateEnvironment();
- while(environ[pos] != NULL) {
- std::string varString = environ[pos];
- std::string varName = varString.substr(0, varString.find_first_of('='));
-@@ -73,8 +73,9 @@ bool LaunchApp(const std::vector<std::st
- if (combined_env_vars.find(varName) == combined_env_vars.end()) {
- combined_env_vars[varName] = varValue;
- }
-- pos++;
-+ PR_Free(environ[pos++]);
- }
-+ PR_Free(environ);
- int varsLen = combined_env_vars.size() + 1;
-
- char** vars = new char*[varsLen];