diff options
| author | Bram Moolenaar <bram@vim.org> | 2013-06-13 20:57:50 +0200 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2013-06-13 20:57:50 +0200 |
| commit | 8d0a9b1db45eea09a395c4d7db14d072b7635340 (patch) | |
| tree | 91b2446e093c640bd387c0b66af1aea882e16725 | |
| parent | aa09b25914bb91fb512cf99eba8229a67d247e22 (diff) | |
| download | vim-8d0a9b1db45eea09a395c4d7db14d072b7635340.tar.gz | |
Problem: Python 3: test 87 may crash.
Solution: Use _PyArg_Parse_SizeT instead of PyArg_Parse. (Jun Takimoto)
| -rw-r--r-- | src/if_python3.c | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/if_python3.c b/src/if_python3.c index a4f96407..d53d601f 100644 --- a/src/if_python3.c +++ b/src/if_python3.c @@ -425,13 +425,8 @@ static struct {"PySys_SetArgv", (PYTHON_PROC*)&py3_PySys_SetArgv}, {"Py_SetPythonHome", (PYTHON_PROC*)&py3_Py_SetPythonHome}, {"Py_Initialize", (PYTHON_PROC*)&py3_Py_Initialize}, -# ifndef PY_SSIZE_T_CLEAN - {"PyArg_ParseTuple", (PYTHON_PROC*)&py3_PyArg_ParseTuple}, - {"Py_BuildValue", (PYTHON_PROC*)&py3_Py_BuildValue}, -# else {"_PyArg_ParseTuple_SizeT", (PYTHON_PROC*)&py3_PyArg_ParseTuple}, {"_Py_BuildValue_SizeT", (PYTHON_PROC*)&py3_Py_BuildValue}, -# endif {"PyMem_Free", (PYTHON_PROC*)&py3_PyMem_Free}, {"PyMem_Malloc", (PYTHON_PROC*)&py3_PyMem_Malloc}, {"PyList_New", (PYTHON_PROC*)&py3_PyList_New}, @@ -488,7 +483,7 @@ static struct {"PyEval_InitThreads", (PYTHON_PROC*)&py3_PyEval_InitThreads}, {"PyEval_RestoreThread", (PYTHON_PROC*)&py3_PyEval_RestoreThread}, {"PyEval_SaveThread", (PYTHON_PROC*)&py3_PyEval_SaveThread}, - {"PyArg_Parse", (PYTHON_PROC*)&py3_PyArg_Parse}, + {"_PyArg_Parse_SizeT", (PYTHON_PROC*)&py3_PyArg_Parse}, {"Py_IsInitialized", (PYTHON_PROC*)&py3_Py_IsInitialized}, {"_PyObject_NextNotImplemented", (PYTHON_PROC*)&py3__PyObject_NextNotImplemented}, {"_Py_NoneStruct", (PYTHON_PROC*)&py3__Py_NoneStruct}, diff --git a/src/version.c b/src/version.c index 7f315b81..ddc51d0f 100644 --- a/src/version.c +++ b/src/version.c @@ -729,6 +729,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1186, +/**/ 1185, /**/ 1184, |