gh-99845: Clean up _PyObject_VAR_SIZE() usage (#99847)

vstinner · web-flow · commit 74d5f61ebd1c · 2022-11-29T12:15:21.000+01:00
* code_sizeof() now uses an unsigned type (size_t) to compute the result.
* Fix _PyObject_ComputedDictPointer(): cast _PyObject_VAR_SIZE() to
  Py_ssize_t, rather than long: it's a different type on 64-bit Windows.
* Clarify that _PyObject_VAR_SIZE() uses an unsigned type (size_t).
diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c
@@ -2329,15 +2329,14 @@ _PyObject_GC_New(PyTypeObject *tp)
 PyVarObject *
 _PyObject_GC_NewVar(PyTypeObject *tp, Py_ssize_t nitems)
 {
-    size_t size;
     PyVarObject *op;
 
     if (nitems < 0) {
         PyErr_BadInternalCall();
         return NULL;
     }
     size_t presize = _PyType_PreHeaderSize(tp);
-    size = _PyObject_VAR_SIZE(tp, nitems);
+    size_t size = _PyObject_VAR_SIZE(tp, nitems);
     op = (PyVarObject *)gc_alloc(size, presize);
     if (op == NULL) {
         return NULL;
@@ -2351,7 +2350,7 @@ _PyObject_GC_Resize(PyVarObject *op, Py_ssize_t nitems)
 {
     const size_t basicsize = _PyObject_VAR_SIZE(Py_TYPE(op), nitems);
     _PyObject_ASSERT((PyObject *)op, !_PyObject_GC_IS_TRACKED(op));
-    if (basicsize > PY_SSIZE_T_MAX - sizeof(PyGC_Head)) {
+    if (basicsize > (size_t)PY_SSIZE_T_MAX - sizeof(PyGC_Head)) {
         return (PyVarObject *)PyErr_NoMemory();
     }
 
diff --git a/Objects/codeobject.c b/Objects/codeobject.c
@@ -1867,15 +1867,13 @@ static PyGetSetDef code_getsetlist[] = {
 static PyObject *
 code_sizeof(PyCodeObject *co, PyObject *Py_UNUSED(args))
 {
-    Py_ssize_t res = _PyObject_VAR_SIZE(Py_TYPE(co), Py_SIZE(co));
-
+    size_t res = _PyObject_VAR_SIZE(Py_TYPE(co), Py_SIZE(co));
     _PyCodeObjectExtra *co_extra = (_PyCodeObjectExtra*) co->co_extra;
     if (co_extra != NULL) {
-        res += sizeof(_PyCodeObjectExtra) +
-               (co_extra->ce_size-1) * sizeof(co_extra->ce_extras[0]);
+        res += sizeof(_PyCodeObjectExtra);
+        res += ((size_t)co_extra->ce_size - 1) * sizeof(co_extra->ce_extras[0]);
     }
-
-    return PyLong_FromSsize_t(res);
+    return PyLong_FromSize_t(res);
 }
 
 static PyObject *
diff --git a/Objects/object.c b/Objects/object.c
@@ -1043,22 +1043,25 @@ PyObject_SetAttr(PyObject *v, PyObject *name, PyObject *value)
 PyObject **
 _PyObject_ComputedDictPointer(PyObject *obj)
 {
-    Py_ssize_t dictoffset;
     PyTypeObject *tp = Py_TYPE(obj);
-
     assert((tp->tp_flags & Py_TPFLAGS_MANAGED_DICT) == 0);
-    dictoffset = tp->tp_dictoffset;
-    if (dictoffset == 0)
+
+    Py_ssize_t dictoffset = tp->tp_dictoffset;
+    if (dictoffset == 0) {
         return NULL;
+    }
+
     if (dictoffset < 0) {
         assert(dictoffset != -1);
+
         Py_ssize_t tsize = Py_SIZE(obj);
         if (tsize < 0) {
             tsize = -tsize;
         }
         size_t size = _PyObject_VAR_SIZE(tp, tsize);
+        assert(size <= (size_t)PY_SSIZE_T_MAX);
+        dictoffset += (Py_ssize_t)size;
 
-        dictoffset += (long)size;
         _PyObject_ASSERT(obj, dictoffset > 0);
         _PyObject_ASSERT(obj, dictoffset % SIZEOF_VOID_P == 0);
     }

Original file line number	Diff line number	Diff line change
`@@ -2329,15 +2329,14 @@ _PyObject_GC_New(PyTypeObject *tp)`
`2329`	`2329`	`PyVarObject *`
`2330`	`2330`	`_PyObject_GC_NewVar(PyTypeObject *tp, Py_ssize_t nitems)`
`2331`	`2331`	`{`
`2332`		`- size_t size;`
`2333`	`2332`	`PyVarObject *op;`
`2334`	`2333`
`2335`	`2334`	`if (nitems < 0) {`
`2336`	`2335`	`PyErr_BadInternalCall();`
`2337`	`2336`	`return NULL;`
`2338`	`2337`	`}`
`2339`	`2338`	`size_t presize = _PyType_PreHeaderSize(tp);`
`2340`		`- size = _PyObject_VAR_SIZE(tp, nitems);`
	`2339`	`+ size_t size = _PyObject_VAR_SIZE(tp, nitems);`
`2341`	`2340`	`op = (PyVarObject *)gc_alloc(size, presize);`
`2342`	`2341`	`if (op == NULL) {`
`2343`	`2342`	`return NULL;`
`@@ -2351,7 +2350,7 @@ _PyObject_GC_Resize(PyVarObject *op, Py_ssize_t nitems)`
`2351`	`2350`	`{`
`2352`	`2351`	`const size_t basicsize = _PyObject_VAR_SIZE(Py_TYPE(op), nitems);`
`2353`	`2352`	`_PyObject_ASSERT((PyObject *)op, !_PyObject_GC_IS_TRACKED(op));`
`2354`		`- if (basicsize > PY_SSIZE_T_MAX - sizeof(PyGC_Head)) {`
	`2353`	`+ if (basicsize > (size_t)PY_SSIZE_T_MAX - sizeof(PyGC_Head)) {`
`2355`	`2354`	`return (PyVarObject *)PyErr_NoMemory();`
`2356`	`2355`	`}`
`2357`	`2356`
Original file line number	Diff line number	Diff line change
`@@ -1867,15 +1867,13 @@ static PyGetSetDef code_getsetlist[] = {`
`1867`	`1867`	`static PyObject *`
`1868`	`1868`	`code_sizeof(PyCodeObject co, PyObject Py_UNUSED(args))`
`1869`	`1869`	`{`
`1870`		`- Py_ssize_t res = _PyObject_VAR_SIZE(Py_TYPE(co), Py_SIZE(co));`
`1871`		`-`
	`1870`	`+ size_t res = _PyObject_VAR_SIZE(Py_TYPE(co), Py_SIZE(co));`
`1872`	`1871`	`_PyCodeObjectExtra co_extra = (_PyCodeObjectExtra) co->co_extra;`
`1873`	`1872`	`if (co_extra != NULL) {`
`1874`		`- res += sizeof(_PyCodeObjectExtra) +`
`1875`		`- (co_extra->ce_size-1) * sizeof(co_extra->ce_extras[0]);`
	`1873`	`+ res += sizeof(_PyCodeObjectExtra);`
	`1874`	`+ res += ((size_t)co_extra->ce_size - 1) * sizeof(co_extra->ce_extras[0]);`
`1876`	`1875`	`}`
`1877`		`-`
`1878`		`- return PyLong_FromSsize_t(res);`
	`1876`	`+ return PyLong_FromSize_t(res);`
`1879`	`1877`	`}`
`1880`	`1878`
`1881`	`1879`	`static PyObject *`