diff options
| author | Tor Lillqvist <tml@collabora.com> | 2020-12-01 21:36:05 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2020-12-02 08:44:08 +0100 |
| commit | ff270d936d1d0209d9036aaa9149a8ee489aaebf (patch) | |
| tree | aaa19c43aeb8d9f55e38522e889bcf49a6a283b9 /external/python3 | |
| parent | Removed triplicated includes (diff) | |
| download | core-ff270d936d1d0209d9036aaa9149a8ee489aaebf.tar.gz core-ff270d936d1d0209d9036aaa9149a8ee489aaebf.zip | |
Guard against sysconf(_SC_OPEN_MAX) returning LONG_MAX
That seems to happen in a sandboxed process on macOS, at least. This
caused an apparent hang when invoking Python, for instance simply
through Tools > Macros > Run Macro... .
Change-Id: I6bc055b44f298251ed596084538b98442c215fce
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107013
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'external/python3')
| -rw-r--r-- | external/python3/macos-11.patch.0 | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/external/python3/macos-11.patch.0 b/external/python3/macos-11.patch.0 index 23fc5f9760c5..3c42d515f6bd 100644 --- a/external/python3/macos-11.patch.0 +++ b/external/python3/macos-11.patch.0 @@ -48,3 +48,23 @@ #else #error "unknown architecture for universal build." #endif +--- Modules/_posixsubprocess.c ++++ Modules/_posixsubprocess.c +@@ -31,6 +31,8 @@ + # define SYS_getdents64 __NR_getdents64 + #endif + ++#include <limits.h> ++ + #if defined(__sun) && defined(__SVR4) + /* readdir64 is used to work around Solaris 9 bug 6395699. */ + # define readdir readdir64 +@@ -202,7 +202,7 @@ + #endif + #ifdef _SC_OPEN_MAX + local_max_fd = sysconf(_SC_OPEN_MAX); +- if (local_max_fd == -1) ++ if (local_max_fd == -1 || local_max_fd == LONG_MAX) + #endif + local_max_fd = 256; /* Matches legacy Lib/subprocess.py behavior. */ + return local_max_fd; |