From: Serhiy Storchaka <storchaka@gmail.com>
Date: Mon, 4 Oct 2021 14:07:21 +0000 (+0300)
Subject: [3.10] bpo-45355: More use of sizeof(_Py_CODEUNIT) (GH-28720). (GH-28721)
X-Git-Tag: v3.10.1~228
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1670d590fa6b817e0d3f091ea12aee9ae744875a;p=thirdparty%2FPython%2Fcpython.git

[3.10] bpo-45355: More use of sizeof(_Py_CODEUNIT) (GH-28720). (GH-28721)

(cherry picked from commit 252b7bcb236dc261f3af1275bc90f9a303d9648f)
---

diff --git a/Objects/frameobject.c b/Objects/frameobject.c
index 8974d3741235..d02cf9d3ba9f 100644
--- a/Objects/frameobject.c
+++ b/Objects/frameobject.c
@@ -275,8 +275,8 @@ marklines(PyCodeObject *code, int len)
     }
 
     while (PyLineTable_NextAddressRange(&bounds)) {
-        assert(bounds.ar_start/2 < len);
-        linestarts[bounds.ar_start/2] = bounds.ar_line;
+        assert(bounds.ar_start/(int)sizeof(_Py_CODEUNIT) < len);
+        linestarts[bounds.ar_start/sizeof(_Py_CODEUNIT)] = bounds.ar_line;
     }
     return linestarts;
 }
diff --git a/Python/compile.c b/Python/compile.c
index b007859bd2e7..97aa2247f609 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -6619,7 +6619,7 @@ static int
 assemble_line_range(struct assembler *a)
 {
     int ldelta, bdelta;
-    bdelta =  (a->a_offset - a->a_lineno_start) * 2;
+    bdelta =  (a->a_offset - a->a_lineno_start) * sizeof(_Py_CODEUNIT);
     if (bdelta == 0) {
         return 1;
     }