From 71211e33861b98a1d166afe270c19a2828691060 Mon Sep 17 00:00:00 2001
From: Victor Stinner <victor.stinner@gmail.com>
Date: Thu, 8 Sep 2016 10:52:46 -0700
Subject: Add assertions to dk_set_index()

Issue #27350.
---
 Objects/dictobject.c | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index 866a233..98515e9 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -304,20 +304,24 @@ static inline Py_ssize_t
 dk_get_index(PyDictKeysObject *keys, Py_ssize_t i)
 {
     Py_ssize_t s = DK_SIZE(keys);
+    Py_ssize_t ix;
+
     if (s <= 0xff) {
-        return ((char*) &keys->dk_indices[0])[i];
+        ix = ((char*) &keys->dk_indices[0])[i];
     }
     else if (s <= 0xffff) {
-        return ((int16_t*)&keys->dk_indices[0])[i];
+        ix = ((int16_t*)&keys->dk_indices[0])[i];
     }
 #if SIZEOF_VOID_P > 4
     else if (s <= 0xffffffff) {
-        return ((int32_t*)&keys->dk_indices[0])[i];
+        ix = ((int32_t*)&keys->dk_indices[0])[i];
     }
 #endif
     else {
-        return ((Py_ssize_t*)&keys->dk_indices[0])[i];
+        ix = ((Py_ssize_t*)&keys->dk_indices[0])[i];
     }
+    assert(ix >= DKIX_DUMMY);
+    return ix;
 }
 
 /* write to indices. */
@@ -325,14 +329,20 @@ static inline void
 dk_set_index(PyDictKeysObject *keys, Py_ssize_t i, Py_ssize_t ix)
 {
     Py_ssize_t s = DK_SIZE(keys);
+
+    assert(ix >= DKIX_DUMMY);
+
     if (s <= 0xff) {
+        assert(ix <= 0x7f);
         ((char*) &keys->dk_indices[0])[i] = (char)ix;
     }
     else if (s <= 0xffff) {
+        assert(ix <= 0x7fff);
         ((int16_t*) &keys->dk_indices[0])[i] = (int16_t)ix;
     }
 #if SIZEOF_VOID_P > 4
     else if (s <= 0xffffffff) {
+        assert(ix <= 0x7fffffff);
         ((int32_t*) &keys->dk_indices[0])[i] = (int32_t)ix;
     }
 #endif
-- 
cgit v0.12