X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/8e07ea1a05e801e52061e880aa36b7cec5895f5a..d3155315c85212f224fc5df0239182dafdfd6284:/src/w32fns.c diff --git a/src/w32fns.c b/src/w32fns.c index 6abb433fd2..3a6fa62405 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -29,6 +29,8 @@ along with GNU Emacs. If not, see . */ #include #include +#include + #include "lisp.h" #include "w32term.h" #include "frame.h" @@ -7038,7 +7040,28 @@ a ShowWindow flag: #else /* !CYGWIN */ - current_dir = ENCODE_FILE (current_dir); + const char file_url_str[] = "file:///"; + const int file_url_len = sizeof (file_url_str) - 1; + if (strncmp (SSDATA (document), file_url_str, file_url_len) == 0) + { + /* Passing "file:///" URLs to ShellExecute causes shlwapi.dll to + start a thread in some rare system configurations, for + unknown reasons. That thread is started in the context of + the Emacs process, but out of control of our code, and seems + to never exit afterwards. Each such thread reserves 8MB of + stack space (because that's the value recorded in the Emacs + executable at link time: Emacs needs a large stack). So a + large enough number of invocations of w32-shell-execute can + potentially cause the Emacs process to run out of available + address space, which is nasty. To work around this, we + convert such URLs to local file names, which seems to prevent + those threads from starting. See bug #20220. */ + char *p = SSDATA (document) + file_url_len; + + if (c_isalpha (*p) && p[1] == ':' && IS_DIRECTORY_SEP (p[2])) + document = Fsubstring_no_properties (document, + make_number (file_url_len), Qnil); + } /* We have a situation here. If DOCUMENT is a relative file name, but its name includes leading directories, i.e. it lives not in CURRENT_DIR, but in its subdirectory, then ShellExecute below @@ -7071,6 +7094,8 @@ a ShowWindow flag: else document = ENCODE_FILE (document); UNGCPRO; + + current_dir = ENCODE_FILE (current_dir); if (use_unicode) { wchar_t document_w[MAX_PATH], current_dir_w[MAX_PATH]; @@ -7510,13 +7535,13 @@ elements (all size values are in pixels). - `title-bar-height' is the height of the title bar of FRAME. -- `menu-bar-external' if `t' means the menu bar is by default external +- `menu-bar-external' if t means the menu bar is by default external (not included in the inner size of FRAME). - `menu-bar-size' is a cons of the width and height of the menu bar of FRAME. -- `tool-bar-external' if `t' means the tool bar is by default external +- `tool-bar-external' if t means the tool bar is by default external (not included in the inner size of FRAME). - `tool-bar-side' tells tells on which side the tool bar on FRAME is by