Mercurial > vim
diff src/if_py_both.h @ 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 | 73557eda7027 |
| children | 5e909c379a1e |
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;