# HG changeset patch # User Bram Moolenaar # Date 1601726404 -7200 # Node ID 93f3cdc296e7e92f853c9bd07fc06c360693ffc2 # Parent 9bbe172e1c441040ca17eab5c82f291e9c1e69bc patch 8.2.1790: MS-Windows with Python: crash when executed from Vifm Commit: https://github.com/vim/vim/commit/794771cfd83af2a0d1926bed301e784447e7290b Author: Bram Moolenaar Date: Sat Oct 3 13:57:13 2020 +0200 patch 8.2.1790: MS-Windows with Python: crash when executed from Vifm Problem: MS-Windows with Python: crash when executed from Vifm. Solution: Use NUL instead of CONIN. (Ken Takata, closes https://github.com/vim/vim/issues/7061, closes https://github.com/vim/vim/issues/7053) diff --git a/src/if_python3.c b/src/if_python3.c --- a/src/if_python3.c +++ b/src/if_python3.c @@ -909,7 +909,7 @@ static wchar_t *py_home_buf = NULL; #if defined(MSWIN) && (PY_VERSION_HEX >= 0x030500f0) // Python 3.5 or later will abort inside Py_Initialize() when stdin is -// redirected. Reconnect stdin to CONIN$. +// redirected. Reconnect stdin to NUL. // Note that the python DLL is linked to its own stdio DLL which can be // differ from Vim's stdio. static void @@ -938,11 +938,11 @@ reset_stdin(void) pyfreopen = (void*)GetProcAddress(hpystdiodll, "freopen"); } - // Reconnect stdin to CONIN$. + // Reconnect stdin to NUL. if (pyfreopen) - pyfreopen("CONIN$", "r", py__acrt_iob_func(0)); + pyfreopen("NUL", "r", py__acrt_iob_func(0)); else - freopen("CONIN$", "r", stdin); + freopen("NUL", "r", stdin); } #else # define reset_stdin() diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1790, +/**/ 1789, /**/ 1788,