diff options
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/getargs.c | 10 | ||||
| -rw-r--r-- | Python/pythonrun.c | 4 |
2 files changed, 9 insertions, 5 deletions
diff --git a/Python/getargs.c b/Python/getargs.c index 7c9774fb82..766a2d7007 100644 --- a/Python/getargs.c +++ b/Python/getargs.c @@ -1312,7 +1312,7 @@ convertbuffer(PyObject *arg, void **p, char **errmsg) } static int -getbuffer(PyObject *arg, Py_buffer *view, char**errmsg) +getbuffer(PyObject *arg, Py_buffer *view, char **errmsg) { void *buf; Py_ssize_t count; @@ -1322,8 +1322,10 @@ getbuffer(PyObject *arg, Py_buffer *view, char**errmsg) return -1; } if (pb->bf_getbuffer) { - if (pb->bf_getbuffer(arg, view, 0) < 0) + if (pb->bf_getbuffer(arg, view, 0) < 0) { + *errmsg = "convertible to a buffer"; return -1; + } if (!PyBuffer_IsContiguous(view, 'C')) { *errmsg = "contiguous buffer"; return -1; @@ -1332,8 +1334,10 @@ getbuffer(PyObject *arg, Py_buffer *view, char**errmsg) } count = convertbuffer(arg, &buf, errmsg); - if (count < 0) + if (count < 0) { + *errmsg = "convertible to a buffer"; return count; + } PyBuffer_FillInfo(view, NULL, buf, count, 1, 0); return 0; } diff --git a/Python/pythonrun.c b/Python/pythonrun.c index bd4f494425..bdd9bd7d88 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -132,8 +132,8 @@ Py_InitializeEx(int install_sigs) PyThreadState *tstate; PyObject *bimod, *sysmod; char *p; - char *icodeset; /* On Windows, input codeset may theoretically - differ from output codeset. */ + char *icodeset = NULL; /* On Windows, input codeset may theoretically + differ from output codeset. */ char *codeset = NULL; char *errors = NULL; int free_codeset = 0; |