diff options
| author | jbeich <jbeich@FreeBSD.org> | 2016-03-26 07:30:06 +0800 |
|---|---|---|
| committer | jbeich <jbeich@FreeBSD.org> | 2016-03-26 07:30:06 +0800 |
| commit | de8ef0fdb0de27b3992d261bccafa2cf1d371c22 (patch) | |
| tree | 31c45d42ace7625b5d02c7fe6d6df59e8f756aff /www/libxul | |
| parent | a2384bd530ef506bbf060148bd398a7952b439cc (diff) | |
| download | freebsd-ports-gnome-de8ef0fdb0de27b3992d261bccafa2cf1d371c22.tar.gz freebsd-ports-gnome-de8ef0fdb0de27b3992d261bccafa2cf1d371c22.tar.zst freebsd-ports-gnome-de8ef0fdb0de27b3992d261bccafa2cf1d371c22.zip | |
gecko: fix an unlikely race with environ(7)
MFH: 2016Q1
Diffstat (limited to 'www/libxul')
| -rw-r--r-- | www/libxul/Makefile | 1 | ||||
| -rw-r--r-- | www/libxul/files/patch-bug1233275 | 40 |
2 files changed, 41 insertions, 0 deletions
diff --git a/www/libxul/Makefile b/www/libxul/Makefile index cfac633293ee..b34550bbf98d 100644 --- a/www/libxul/Makefile +++ b/www/libxul/Makefile @@ -3,6 +3,7 @@ PORTNAME= libxul DISTVERSION= 38.7.1 +PORTREVISION= 1 CATEGORIES?= www devel MASTER_SITES= MOZILLA/firefox/releases/${DISTVERSION}esr/source \ MOZILLA/firefox/candidates/${DISTVERSION}esr-candidates/build1/source diff --git a/www/libxul/files/patch-bug1233275 b/www/libxul/files/patch-bug1233275 new file mode 100644 index 000000000000..e99e86a74ce0 --- /dev/null +++ b/www/libxul/files/patch-bug1233275 @@ -0,0 +1,40 @@ +# 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 +@@ -13,6 +13,7 @@ + + #include <string> + ++#include "nspr.h" + #include "base/eintr_wrapper.h" + #include "base/file_util.h" + #include "base/logging.h" +@@ -48,7 +49,6 @@ + + #ifdef HAVE_POSIX_SPAWN + #include <spawn.h> +-extern "C" char **environ __dso_public; + #endif + + namespace { +@@ -114,6 +114,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('=')); +@@ -121,8 +122,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]; |