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

Fix buffer offset calculation (need to compute it before changing 

'base').  Fixes SF bug #1033720.  Move offset sanity checking to
buffer_from_memory().
This commit is contained in:
Neil Schemenauer 2004-09-24 15:41:27 +00:00
parent 29302a7867
commit fb6ba07d9c
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Objects/bufferobject.c
View File

@ -66,6 +66,11 @@ buffer_from_memory(PyObject *base, int size, int offset, void *ptr,
"size must be zero or positive"); "size must be zero or positive");
return NULL; return NULL;
} }
if (offset < 0) {
PyErr_SetString(PyExc_ValueError,
"offset must be zero or positive");
return NULL;
}
b = PyObject_NEW(PyBufferObject, &PyBuffer_Type); b = PyObject_NEW(PyBufferObject, &PyBuffer_Type);
if ( b == NULL ) if ( b == NULL )
@ -85,20 +90,11 @@ buffer_from_memory(PyObject *base, int size, int offset, void *ptr,
static PyObject * static PyObject *
buffer_from_object(PyObject *base, int size, int offset, int readonly) buffer_from_object(PyObject *base, int size, int offset, int readonly)
{ {
if ( offset < 0 ) {
PyErr_SetString(PyExc_ValueError,
"offset must be zero or positive");
return NULL;
}
/* if the base object is another buffer, then try to refer to the
* base object.
*/
if ( PyBuffer_Check(base) && (((PyBufferObject *)base)->b_base) ) { if ( PyBuffer_Check(base) && (((PyBufferObject *)base)->b_base) ) {
/* another buffer, refer to the base object */
offset += ((PyBufferObject *)base)->b_offset;
base = ((PyBufferObject *)base)->b_base; base = ((PyBufferObject *)base)->b_base;
offset = ((PyBufferObject *)base)->b_offset + offset;
} }
return buffer_from_memory(base, size, offset, NULL, readonly); return buffer_from_memory(base, size, offset, NULL, readonly);
} }