forked from aniani/vim
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 #5423)
This commit is contained in:
@@ -19,7 +19,7 @@ static char_u e_py_systemexit[] = "E880: Can't handle SystemExit of %s exception
|
|||||||
typedef int Py_ssize_t; // Python 2.4 and earlier don't have this type.
|
typedef int Py_ssize_t; // Python 2.4 and earlier don't have this type.
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define ENC_OPT ((char *)p_enc)
|
#define ENC_OPT (enc_utf8 ? "utf-8" : (char *)p_enc)
|
||||||
#define DOPY_FUNC "_vim_pydo"
|
#define DOPY_FUNC "_vim_pydo"
|
||||||
|
|
||||||
static const char *vim_special_path = "_vim_path_";
|
static const char *vim_special_path = "_vim_path_";
|
||||||
|
@@ -167,3 +167,10 @@ func Test_Catch_Exception_Message()
|
|||||||
call assert_match( '^Vim(.*):RuntimeError: TEST$', v:exception )
|
call assert_match( '^Vim(.*):RuntimeError: TEST$', v:exception )
|
||||||
endtry
|
endtry
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
|
func Test_unicode()
|
||||||
|
" this crashed Vim once
|
||||||
|
set encoding=utf32
|
||||||
|
py3 print('hello')
|
||||||
|
set encoding=utf8
|
||||||
|
endfunc
|
||||||
|
@@ -742,6 +742,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
68,
|
||||||
/**/
|
/**/
|
||||||
67,
|
67,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user