From faca84059a6ef728e1326becc2f82345a59b50c7 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 21 Oct 2012 02:37:10 +0200 Subject: [PATCH] updated for version 7.3.701 Problem: MS-Windows: Crash with stack overflow when setting 'encoding'. Solution: Handle that loading the iconv library may be called recursively. (Jiri Sedlak) --- src/os_win32.c | 16 ++++++++++++---- src/version.c | 2 ++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/os_win32.c b/src/os_win32.c index 8151e6054a..006a361448 100644 --- a/src/os_win32.c +++ b/src/os_win32.c @@ -288,18 +288,26 @@ unescape_shellxquote(char_u *p, char_u *escaped) vimLoadLib(char *name) { HINSTANCE dll = NULL; - char old_dir[MAXPATHL]; + TCHAR old_dir[MAXPATHL]; + /* NOTE: Do not use mch_dirname() and mch_chdir() here, they may call + * vimLoadLib() recursively, which causes a stack overflow. */ if (exe_path == NULL) get_exe_name(); - if (exe_path != NULL && mch_dirname(old_dir, MAXPATHL) == OK) + if (exe_path != NULL && GetCurrentDirectory(MAXPATHL, old_dir) != 0) { /* Change directory to where the executable is, both to make sure we * find a .dll there and to avoid looking for a .dll in the current * directory. */ - mch_chdir(exe_path); + SetCurrentDirectory(exe_path); + dll = LoadLibrary(name); + SetCurrentDirectory(old_dir); + } + else + { + /* We are not able to change directory to where the executable is, try + * to load library anyway. */ dll = LoadLibrary(name); - mch_chdir(old_dir); } return dll; } diff --git a/src/version.c b/src/version.c index cbe525cc24..6afb9d16b3 100644 --- a/src/version.c +++ b/src/version.c @@ -719,6 +719,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 701, /**/ 700, /**/ -- 2.47.2