Mercurial > vim

changeset 19019:75562beba71c v8.2.0070

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.0070: crash when using Python 3 with "debug" encoding Commit: https://github.com/vim/vim/commit/d518f952f0812778758b25139308bcf45df6988c Author: Bram Moolenaar <Bram@vim.org> Date: Wed Jan 1 15:04:17 2020 +0100 patch 8.2.0070: crash when using Python 3 with "debug" encoding Problem: Crash when using Python 3 with "debug" encoding. (Dominique Pelle) Solution: Use "euc-jp" whenever enc_dbcs is set.
author Bram Moolenaar <Bram@vim.org>
date Wed, 01 Jan 2020 15:15:04 +0100
parents fe21356aa0fc
children ad42a3aebe99
files src/if_py_both.h src/testdir/test_python3.vim src/version.c
diffstat 3 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -19,7 +19,8 @@ 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 (enc_utf8 ? "utf-8" : (char *)p_enc)
+// Use values that are known to work, others may make Vim crash.
+#define ENC_OPT (enc_utf8 ? "utf-8" : enc_dbcs ? "euc-jp" : (char *)p_enc)
 #define DOPY_FUNC "_vim_pydo"
 
 static const char *vim_special_path = "_vim_path_";
--- a/src/testdir/test_python3.vim
+++ b/src/testdir/test_python3.vim
@@ -172,5 +172,9 @@ func Test_unicode()
   " this crashed Vim once
   set encoding=utf32
   py3 print('hello')
+  set encoding=debug
+  py3 print('hello')
+  set encoding=euc-tw
+  py3 print('hello')
   set encoding=utf8
 endfunc
--- 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 */
 /**/
+    70,
+/**/
     69,
 /**/
     68,