diff options
| -rw-r--r-- | Misc/NEWS | 7 | ||||
| -rw-r--r-- | Python/getargs.c | 7 |
2 files changed, 9 insertions, 5 deletions
@@ -12,6 +12,13 @@ What's New in Python 2.5 alpha 2? Core and builtins ----------------- +- Bug #1454485, array.array('u') could crash the interpreter. This was + due to PyArgs_ParseTuple(args, 'u#', ...) trying to convert buffers (strings) + to unicode when it didn't make sense. 'u#' now requires a unicode string. + +- Py_UNICODE is unsigned. It was always documented as unsigned, but + due to a bug had a signed value in previous versions. + - Patch #837242: ``id()`` of any Python object always gives a positive number now, which might be a long integer. ``PyLong_FromVoidPtr`` and ``PyLong_AsVoidPtr`` have been changed accordingly. Note that it has diff --git a/Python/getargs.c b/Python/getargs.c index e6f607a..5908e6b 100644 --- a/Python/getargs.c +++ b/Python/getargs.c @@ -1042,11 +1042,8 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags, STORE_SIZE(PyUnicode_GET_SIZE(arg)); } else { - char *buf; - Py_ssize_t count = convertbuffer(arg, p, &buf); - if (count < 0) - return converterr(buf, arg, msgbuf, bufsize); - STORE_SIZE(count/(sizeof(Py_UNICODE))); + return converterr("cannot convert raw buffers", + arg, msgbuf, bufsize); } format++; } else { |