Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

_PyObject_GetDictPtr(): when the offset is negative, always align -- 

we can't trust that tp_basicsize is aligned.  Fixes SF bug #462848.
This commit is contained in:
Guido van Rossum 2001-09-20 13:38:22 +00:00
parent aefd766eed
commit dd4d1c4f5d
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Objects/object.c
View File

@ -1150,18 +1150,13 @@ _PyObject_GetDictPtr(PyObject *obj)
return NULL;
if (dictoffset < 0) {
dictoffset += tp->tp_basicsize;
dictoffset += tp->tp_itemsize * ((PyVarObject *)obj)->ob_size;
assert(dictoffset > 0); /* Sanity check */
if (tp->tp_itemsize > 0) {
int n = ((PyVarObject *)obj)->ob_size;
if (n > 0) {
dictoffset += tp->tp_itemsize * n;
/* Round up, if necessary */
if (tp->tp_itemsize % PTRSIZE != 0) {
dictoffset += PTRSIZE - 1;
dictoffset /= PTRSIZE;
dictoffset *= PTRSIZE;
}
}
/* Round up, if necessary */
if (dictoffset % PTRSIZE != 0) {
dictoffset /= PTRSIZE;
dictoffset += 1;
dictoffset *= PTRSIZE;
}
}
return (PyObject **) ((char *)obj + dictoffset);