traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Be more robust around bytes for e[st]#? formats.

This commit is contained in:
Guido van Rossum 2007-05-09 23:35:09 +00:00
parent 6262cc79d7
commit d70539abef
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Python/getargs.c
View File

@ -915,7 +915,7 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
PyObject *s; PyObject *s;
int recode_strings; int recode_strings;
Py_ssize_t size; Py_ssize_t size;
char *ptr; const char *ptr;
/* Get 'e' parameter: the encoding name */ /* Get 'e' parameter: the encoding name */
encoding = (const char *)va_arg(*p_va, const char *); encoding = (const char *)va_arg(*p_va, const char *);
@ -941,11 +941,13 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
arg, msgbuf, bufsize); arg, msgbuf, bufsize);
/* Encode object */ /* Encode object */
if (!recode_strings && PyString_Check(arg)) { if (!recode_strings &&
(PyString_Check(arg) || PyBytes_Check(arg))) {
s = arg; s = arg;
Py_INCREF(s); Py_INCREF(s);
size = PyString_GET_SIZE(s); if (PyObject_AsCharBuffer(s, &ptr, &size) < 0)
ptr = PyString_AS_STRING(s); return converterr("(AsCharBuffer failed)",
arg, msgbuf, bufsize);
} }
else { else {
PyObject *u; PyObject *u;
@ -973,6 +975,8 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
} }
size = PyBytes_GET_SIZE(s); size = PyBytes_GET_SIZE(s);
ptr = PyBytes_AS_STRING(s); ptr = PyBytes_AS_STRING(s);
if (ptr == NULL)
ptr = "";
} }
/* Write output; output is guaranteed to be 0-terminated */ /* Write output; output is guaranteed to be 0-terminated */