Mercurial > vim
changeset 3800:15cdcb8ddcfb v7.3.658
updated for version 7.3.658
Problem: NUL bytes truncate strings when converted from Python.
Solution: Handle truncation as an error. (ZyX)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Wed, 05 Sep 2012 19:09:11 +0200 |
| parents | 48a53e1b08cd |
| children | a3f1d873298a |
| files | src/if_py_both.h src/if_python3.c src/version.c |
| diffstat | 3 files changed, 17 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/if_py_both.h +++ b/src/if_py_both.h @@ -2530,8 +2530,10 @@ ConvertFromPyObject(PyObject *obj, typva #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, typva 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, typva 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, typva } 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;
--- 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 \