Mercurial > cpython-lru_cache-weakref
diff Python/getargs.c @ 41667:4a9533e9365e
Be more robust around bytes for e[st]#? formats.
| author | Guido van Rossum <guido@python.org> |
|---|---|
| date | Wed, 09 May 2007 23:35:09 +0000 |
| parents | c6568550b1c6 |
| children | 4db0a0cc57ab |
line wrap: on
line diff
--- a/Python/getargs.c Wed May 09 23:29:27 2007 +0000 +++ b/Python/getargs.c Wed May 09 23:35:09 2007 +0000 @@ -915,7 +915,7 @@ PyObject *s; int recode_strings; Py_ssize_t size; - char *ptr; + const char *ptr; /* Get 'e' parameter: the encoding name */ encoding = (const char *)va_arg(*p_va, const char *); @@ -941,11 +941,13 @@ arg, msgbuf, bufsize); /* Encode object */ - if (!recode_strings && PyString_Check(arg)) { + if (!recode_strings && + (PyString_Check(arg) || PyBytes_Check(arg))) { s = arg; Py_INCREF(s); - size = PyString_GET_SIZE(s); - ptr = PyString_AS_STRING(s); + if (PyObject_AsCharBuffer(s, &ptr, &size) < 0) + return converterr("(AsCharBuffer failed)", + arg, msgbuf, bufsize); } else { PyObject *u; @@ -973,6 +975,8 @@ } size = PyBytes_GET_SIZE(s); ptr = PyBytes_AS_STRING(s); + if (ptr == NULL) + ptr = ""; } /* Write output; output is guaranteed to be 0-terminated */