aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

updated for version 7.3.658

Browse Source 
Problem:    NUL bytes truncate strings when converted from Python.
Solution:   Handle truncation as an error. (ZyX)
This commit is contained in:
Bram Moolenaar
2012-09-05 19:09:11 +02:00
parent cdab905136
commit afa6b9af86
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/if_py_both.h
View File

@@ -2530,8 +2530,10 @@ _ConvertFromPyObject(PyObject *obj, typval_T *tv, PyObject *lookupDict)
#if PY_MAJOR_VERSION >= 3 #if PY_MAJOR_VERSION >= 3
else if (PyBytes_Check(obj)) else if (PyBytes_Check(obj))
{ {
char_u *result = (char_u *) PyBytes_AsString(obj); char_u *result;
if (PyString_AsStringAndSize(obj, (char **) &result, NULL) == -1)
return -1;
if (result == NULL) if (result == NULL)
return -1; return -1;
@@ -2549,7 +2551,8 @@ _ConvertFromPyObject(PyObject *obj, typval_T *tv, PyObject *lookupDict)
if (bytes == NULL) if (bytes == NULL)
return -1; return -1;
result = (char_u *) PyBytes_AsString(bytes); if(PyString_AsStringAndSize(bytes, (char **) &result, NULL) == -1)
return -1;
if (result == NULL) if (result == NULL)
return -1; return -1;
@@ -2572,7 +2575,8 @@ _ConvertFromPyObject(PyObject *obj, typval_T *tv, PyObject *lookupDict)
if (bytes == NULL) if (bytes == NULL)
return -1; return -1;
result=(char_u *) PyString_AsString(bytes); if(PyString_AsStringAndSize(bytes, (char **) &result, NULL) == -1)
return -1;
if (result == NULL) if (result == NULL)
return -1; return -1;
@@ -2587,8 +2591,10 @@ _ConvertFromPyObject(PyObject *obj, typval_T *tv, PyObject *lookupDict)
} }
else if (PyString_Check(obj)) else if (PyString_Check(obj))
{ {
char_u *result = (char_u *) PyString_AsString(obj); char_u *result;
if(PyString_AsStringAndSize(obj, (char **) &result, NULL) == -1)
return -1;
if (result == NULL) if (result == NULL)
return -1; return -1;

5
src/if_python3.c
View File

@@ -85,6 +85,7 @@ static void init_structs(void);
#define PyString_AsString(obj) PyBytes_AsString(obj) #define PyString_AsString(obj) PyBytes_AsString(obj)
#define PyString_Size(obj) PyBytes_GET_SIZE(bytes) #define PyString_Size(obj) PyBytes_GET_SIZE(bytes)
#define PyString_FromString(repr) PyUnicode_FromString(repr) #define PyString_FromString(repr) PyUnicode_FromString(repr)
#define PyString_AsStringAndSize(obj, buffer, len) PyBytes_AsStringAndSize(obj, buffer, len)
#if defined(DYNAMIC_PYTHON3) || defined(PROTO) #if defined(DYNAMIC_PYTHON3) || defined(PROTO)
@@ -552,7 +553,7 @@ static int py3initialised = 0;
#define DICTKEY_GET(err) \ #define DICTKEY_GET(err) \
if (PyBytes_Check(keyObject)) \ if (PyBytes_Check(keyObject)) \
{ \ { \
if (PyBytes_AsStringAndSize(keyObject, (char **) &key, NULL) == -1) \ if (PyString_AsStringAndSize(keyObject, (char **) &key, NULL) == -1) \
return err; \ return err; \
} \ } \
else if (PyUnicode_Check(keyObject)) \ else if (PyUnicode_Check(keyObject)) \
@@ -560,7 +561,7 @@ static int py3initialised = 0;
bytes = PyString_AsBytes(keyObject); \ bytes = PyString_AsBytes(keyObject); \
if (bytes == NULL) \ if (bytes == NULL) \
return err; \ return err; \
if (PyBytes_AsStringAndSize(bytes, (char **) &key, NULL) == -1) \ if (PyString_AsStringAndSize(bytes, (char **) &key, NULL) == -1) \
return err; \ return err; \
} \ } \
else \ else \

2
src/version.c
View File

@@ -719,6 +719,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 */
/**/
658,
/**/ /**/
657, 657,
/**/ /**/