# HG changeset patch # User Bram Moolenaar # Date 1577826003 -3600 # Node ID a3d9a5e14c1f88ed505edb63ae346d4dcdfe43c3 # Parent 0ecf33c2ad4b8e0ccd965a5009a8cf2dd7c0c514 patch 8.2.0068: crash when using Python 3 with "utf32" encoding Commit: https://github.com/vim/vim/commit/556684ff71e044a642879d759373a7ebc5047fad Author: Bram Moolenaar Date: Tue Dec 31 21:59:01 2019 +0100 patch 8.2.0068: crash when using Python 3 with "utf32" encoding Problem: Crash when using Python 3 with "utf32" encoding. (Dominique Pelle) Solution: Use "utf-8" whenever enc_utf8 is set. (closes https://github.com/vim/vim/issues/5423) diff --git a/src/if_py_both.h b/src/if_py_both.h --- a/src/if_py_both.h +++ b/src/if_py_both.h @@ -19,7 +19,7 @@ static char_u e_py_systemexit[] = "E880: typedef int Py_ssize_t; // Python 2.4 and earlier don't have this type. #endif -#define ENC_OPT ((char *)p_enc) +#define ENC_OPT (enc_utf8 ? "utf-8" : (char *)p_enc) #define DOPY_FUNC "_vim_pydo" static const char *vim_special_path = "_vim_path_"; diff --git a/src/testdir/test_python3.vim b/src/testdir/test_python3.vim --- a/src/testdir/test_python3.vim +++ b/src/testdir/test_python3.vim @@ -167,3 +167,10 @@ func Test_Catch_Exception_Message() call assert_match( '^Vim(.*):RuntimeError: TEST$', v:exception ) endtry endfunc + +func Test_unicode() + " this crashed Vim once + set encoding=utf32 + py3 print('hello') + set encoding=utf8 +endfunc diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -743,6 +743,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 68, +/**/ 67, /**/ 66,