From: Victor Stinner <victor.stinner@gmail.com>
Date: Thu, 8 Sep 2016 18:35:46 +0000 (-0700)
Subject: dk_get_index/dk_set_index uses a type indices variable
X-Git-Tag: v3.6.0b1~260
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=208857ec337ecc065fa0c72bad56ffdf483fe2ae;p=thirdparty%2FPython%2Fcpython.git

dk_get_index/dk_set_index uses a type indices variable

Issue #27350.
---

diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index cd258034df85..ff285bda892f 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -307,18 +307,22 @@ dk_get_index(PyDictKeysObject *keys, Py_ssize_t i)
     Py_ssize_t ix;
 
     if (s <= 0xff) {
-        ix = ((char*) &keys->dk_indices[0])[i];
+        char *indices = (char*)keys->dk_indices;
+        ix = indices[i];
     }
     else if (s <= 0xffff) {
-        ix = ((int16_t*)&keys->dk_indices[0])[i];
+        int16_t *indices = (int16_t*)keys->dk_indices;
+        ix = indices[i];
     }
 #if SIZEOF_VOID_P > 4
     else if (s <= 0xffffffff) {
-        ix = ((int32_t*)&keys->dk_indices[0])[i];
+        int32_t *indices = (int32_t*)keys->dk_indices;
+        ix = indices[i];
     }
 #endif
     else {
-        ix = ((Py_ssize_t*)&keys->dk_indices[0])[i];
+        Py_ssize_t *indices = (Py_ssize_t*)keys->dk_indices;
+        ix = indices[i];
     }
     assert(ix >= DKIX_DUMMY);
     return ix;
@@ -333,21 +337,25 @@ dk_set_index(PyDictKeysObject *keys, Py_ssize_t i, Py_ssize_t ix)
     assert(ix >= DKIX_DUMMY);
 
     if (s <= 0xff) {
+        char *indices = (char*)keys->dk_indices;
         assert(ix <= 0x7f);
-        ((char*) &keys->dk_indices[0])[i] = (char)ix;
+        indices[i] = (char)ix;
     }
     else if (s <= 0xffff) {
+        int16_t *indices = (int16_t*)keys->dk_indices;
         assert(ix <= 0x7fff);
-        ((int16_t*) &keys->dk_indices[0])[i] = (int16_t)ix;
+        indices[i] = (int16_t)ix;
     }
 #if SIZEOF_VOID_P > 4
     else if (s <= 0xffffffff) {
+        int32_t *indices = (int32_t*)keys->dk_indices;
         assert(ix <= 0x7fffffff);
-        ((int32_t*) &keys->dk_indices[0])[i] = (int32_t)ix;
+        indices[i] = (int32_t)ix;
     }
 #endif
     else {
-        ((Py_ssize_t*) &keys->dk_indices[0])[i] = ix;
+        Py_ssize_t *indices = (Py_ssize_t*)keys->dk_indices;
+        indices[i] = ix;
     }
 }