From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Thu, 1 Dec 2022 13:32:15 +0000 (-0800)
Subject: gh-99845: _PyObject_DictPointer(): fix dictoffset cast (GH-99922)
X-Git-Tag: v3.10.9~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=64dae2efd5a083d342d744d40ca8d6ebb28bc771;p=thirdparty%2FPython%2Fcpython.git

gh-99845: _PyObject_DictPointer(): fix dictoffset cast (GH-99922)


Cast size_t to Py_ssize_t, rather than casting it to long. On 64-bit
Windows, long is 32-bit whereas Py_ssize_t is 64-bit.
(cherry picked from commit 9707bf228e008485a3fbb63aa7ee28cf88014f91)

Co-authored-by: Victor Stinner <vstinner@python.org>
---

diff --git a/Objects/object.c b/Objects/object.c
index 6d80d6df7410..0bef2e9dfb5e 100644
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -1091,8 +1091,9 @@ _PyObject_GetDictPtr(PyObject *obj)
             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);
     }