diff options
| author | Bram Moolenaar <Bram@vim.org> | 2012-09-05 19:09:11 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2012-09-05 19:09:11 +0200 |
| commit | afa6b9af865c18dd865ccf7b804a4645570027bd (patch) | |
| tree | c8f8f1be55f7f585f5290ba87da9f6599899ab31 | |
| parent | cdab9051368a6437b7e40df673594147425df751 (diff) | |
updated for version 7.3.658v7.3.658
Problem: NUL bytes truncate strings when converted from Python.
Solution: Handle truncation as an error. (ZyX)
| -rw-r--r-- | src/if_py_both.h | 14 | ||||
| -rw-r--r-- | src/if_python3.c | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 15 insertions, 6 deletions
diff --git a/src/if_py_both.h b/src/if_py_both.h index 3ab18516eb..0031003eda 100644 --- a/src/if_py_both.h +++ b/src/if_py_both.h @@ -2530,8 +2530,10 @@ _ConvertFromPyObject(PyObject *obj, typval_T *tv, PyObject *lookupDict) #if PY_MAJOR_VERSION >= 3 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) return -1; @@ -2549,7 +2551,8 @@ _ConvertFromPyObject(PyObject *obj, typval_T *tv, PyObject *lookupDict) if (bytes == NULL) return -1; - result = (char_u *) PyBytes_AsString(bytes); + if(PyString_AsStringAndSize(bytes, (char **) &result, NULL) == -1) + return -1; if (result == NULL) return -1; @@ -2572,7 +2575,8 @@ _ConvertFromPyObject(PyObject *obj, typval_T *tv, PyObject *lookupDict) if (bytes == NULL) return -1; - result=(char_u *) PyString_AsString(bytes); + if(PyString_AsStringAndSize(bytes, (char **) &result, NULL) == -1) + return -1; if (result == NULL) return -1; @@ -2587,8 +2591,10 @@ _ConvertFromPyObject(PyObject *obj, typval_T *tv, PyObject *lookupDict) } 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) return -1; diff --git a/src/if_python3.c b/src/if_python3.c index 36ae8eb778..0c10f8dbc7 100644 --- a/src/if_python3.c +++ b/src/if_python3.c @@ -85,6 +85,7 @@ static void init_structs(void); #define PyString_AsString(obj) PyBytes_AsString(obj) #define PyString_Size(obj) PyBytes_GET_SIZE(bytes) #define PyString_FromString(repr) PyUnicode_FromString(repr) +#define PyString_AsStringAndSize(obj, buffer, len) PyBytes_AsStringAndSize(obj, buffer, len) #if defined(DYNAMIC_PYTHON3) || defined(PROTO) @@ -552,7 +553,7 @@ static int py3initialised = 0; #define DICTKEY_GET(err) \ if (PyBytes_Check(keyObject)) \ { \ - if (PyBytes_AsStringAndSize(keyObject, (char **) &key, NULL) == -1) \ + if (PyString_AsStringAndSize(keyObject, (char **) &key, NULL) == -1) \ return err; \ } \ else if (PyUnicode_Check(keyObject)) \ @@ -560,7 +561,7 @@ static int py3initialised = 0; bytes = PyString_AsBytes(keyObject); \ if (bytes == NULL) \ return err; \ - if (PyBytes_AsStringAndSize(bytes, (char **) &key, NULL) == -1) \ + if (PyString_AsStringAndSize(bytes, (char **) &key, NULL) == -1) \ return err; \ } \ else \ diff --git a/src/version.c b/src/version.c index 3e0ac40f49..62bc81957f 100644 --- a/src/version.c +++ b/src/version.c @@ -720,6 +720,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 658, +/**/ 657, /**/ 656, |