_PyObject_DebugMalloc(): The return value should add

2*sizeof(size_t) now, not 8.  This probably accounts for
current disasters on the 64-bit buildbot slaves.

diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c
index a3e9bbfb5d267365f080a087d8ed1da3f99f8f50..0ca8f2bcaf20498c07c849d12b70c4269bd33113 100644 (file)
--- a/Objects/obmalloc.c
+++ b/Objects/obmalloc.c
@@ -1337,7 +1337,7 @@ _PyObject_DebugMalloc(size_t nbytes)
        memset(tail, FORBIDDENBYTE, SST);
        write_size_t(tail + SST, serialno);
 
-       return p+8;
+       return p + 2*SST;
 }
 
 /* The debug free first checks the 2*SST bytes on each end for sanity (in