diff options
| author |   Antoine Pitrou <solipsis@pitrou.net> | 2010-01-17 12:31:10 +0000 |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-01-17 12:31:10 +0000 |
| commit | bb667d433c9cf535dd2e574d039f4d905f53ff06 (patch) | |
| tree | e9d5baf036e65d70473e6ddd21aad9691e699f0e /Include | |
| parent | Blocked revisions 77566 via svnmerge (diff) | |
| download | cpython-bb667d433c9cf535dd2e574d039f4d905f53ff06.tar.gz cpython-bb667d433c9cf535dd2e574d039f4d905f53ff06.tar.bz2 cpython-bb667d433c9cf535dd2e574d039f4d905f53ff06.zip | |
Merged revisions 77573 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r77573 | antoine.pitrou | 2010-01-17 13:26:20 +0100 (dim., 17 janv. 2010) | 6 lines
Issue #7561: Operations on empty bytearrays (such as `int(bytearray())`)
could crash in many places because of the PyByteArray_AS_STRING() macro
returning NULL. The macro now returns a statically allocated empty
string instead.
........
Diffstat (limited to 'Include')
| -rw-r--r-- | Include/bytearrayobject.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Include/bytearrayobject.h b/Include/bytearrayobject.h index 265b4bbdd03..8702e5a8340 100644 --- a/Include/bytearrayobject.h +++ b/Include/bytearrayobject.h @@ -44,9 +44,13 @@ PyAPI_FUNC(char *) PyByteArray_AsString(PyObject *); PyAPI_FUNC(int) PyByteArray_Resize(PyObject *, Py_ssize_t); /* Macros, trading safety for speed */ -#define PyByteArray_AS_STRING(self) (assert(PyByteArray_Check(self)),((PyByteArrayObject *)(self))->ob_bytes) +#define PyByteArray_AS_STRING(self) \ + (assert(PyByteArray_Check(self)), \ + Py_SIZE(self) ? ((PyByteArrayObject *)(self))->ob_bytes : _PyByteArray_empty_string) #define PyByteArray_GET_SIZE(self) (assert(PyByteArray_Check(self)),Py_SIZE(self)) +extern char _PyByteArray_empty_string[]; + #ifdef __cplusplus } #endif |