mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-18 07:41:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merged revisions 77573 via svnmerge from

Browse source 
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.
........
This commit is contained in:
Antoine Pitrou 2010-01-17 12:31:10 +00:00
parent 437053eee3
commit bb667d433c
4 changed files with 23 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Include/bytearrayobject.h
View file

@ -44,9 +44,13 @@ PyAPI_FUNC(char *) PyByteArray_AsString(PyObject *);
PyAPI_FUNC(int) PyByteArray_Resize(PyObject *, Py_ssize_t); PyAPI_FUNC(int) PyByteArray_Resize(PyObject *, Py_ssize_t);
/* Macros, trading safety for speed */ /* 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)) #define PyByteArray_GET_SIZE(self) (assert(PyByteArray_Check(self)),Py_SIZE(self))
extern char _PyByteArray_empty_string[];
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

7
Lib/test/test_bytes.py
View file

@ -787,6 +787,13 @@ class ByteArrayTest(BaseBytesTest):
self.assertRaises(BufferError, delslice) self.assertRaises(BufferError, delslice)
self.assertEquals(b, orig) self.assertEquals(b, orig)
def test_empty_bytearray(self):
# Issue #7561: operations on empty bytearrays could crash in many
# situations, due to a fragile implementation of the
# PyByteArray_AS_STRING() C macro.
self.assertRaises(ValueError, int, bytearray(b''))
class AssortedBytesTest(unittest.TestCase): class AssortedBytesTest(unittest.TestCase):
# #
# Test various combinations of bytes and bytearray # Test various combinations of bytes and bytearray

5
Misc/NEWS
View file

@ -12,6 +12,11 @@ What's New in Python 2.6.5
Core and Builtins Core and Builtins
----------------- -----------------
- 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.
- Issue #7604: Deleting an unset slotted attribute did not raise an - Issue #7604: Deleting an unset slotted attribute did not raise an
AttributeError. AttributeError.

14
Objects/bytearrayobject.c
View file

@ -6,6 +6,7 @@
#include "bytes_methods.h" #include "bytes_methods.h"
static PyByteArrayObject *nullbytes = NULL; static PyByteArrayObject *nullbytes = NULL;
char _PyByteArray_empty_string[] = "";
void void
PyByteArray_Fini(void) PyByteArray_Fini(void)
@ -74,7 +75,7 @@ bytes_buffer_getreadbuf(PyByteArrayObject *self, Py_ssize_t index, const void **
"accessing non-existent bytes segment"); "accessing non-existent bytes segment");
return -1; return -1;
} }
*ptr = (void *)self->ob_bytes; *ptr = (void *)PyByteArray_AS_STRING(self);
return Py_SIZE(self); return Py_SIZE(self);
} }
@ -86,7 +87,7 @@ bytes_buffer_getwritebuf(PyByteArrayObject *self, Py_ssize_t index, const void *
"accessing non-existent bytes segment"); "accessing non-existent bytes segment");
return -1; return -1;
} }
*ptr = (void *)self->ob_bytes; *ptr = (void *)PyByteArray_AS_STRING(self);
return Py_SIZE(self); return Py_SIZE(self);
} }
@ -106,7 +107,7 @@ bytes_buffer_getcharbuf(PyByteArrayObject *self, Py_ssize_t index, const char **
"accessing non-existent bytes segment"); "accessing non-existent bytes segment");
return -1; return -1;
} }
*ptr = self->ob_bytes; *ptr = PyByteArray_AS_STRING(self);
return Py_SIZE(self); return Py_SIZE(self);
} }
@ -119,10 +120,7 @@ bytes_getbuffer(PyByteArrayObject *obj, Py_buffer *view, int flags)
obj->ob_exports++; obj->ob_exports++;
return 0; return 0;
} }
if (obj->ob_bytes == NULL) ptr = (void *) PyByteArray_AS_STRING(obj);
ptr = "";
else
ptr = obj->ob_bytes;
ret = PyBuffer_FillInfo(view, (PyObject*)obj, ptr, Py_SIZE(obj), 0, flags); ret = PyBuffer_FillInfo(view, (PyObject*)obj, ptr, Py_SIZE(obj), 0, flags);
if (ret >= 0) { if (ret >= 0) {
obj->ob_exports++; obj->ob_exports++;
@ -201,7 +199,7 @@ PyByteArray_FromStringAndSize(const char *bytes, Py_ssize_t size)
Py_DECREF(new); Py_DECREF(new);
return PyErr_NoMemory(); return PyErr_NoMemory();
} }
if (bytes != NULL) if (bytes != NULL && size > 0)
memcpy(new->ob_bytes, bytes, size); memcpy(new->ob_bytes, bytes, size);
new->ob_bytes[size] = '\0'; /* Trailing null byte */ new->ob_bytes[size] = '\0'; /* Trailing null byte */
} }