commit f19ed6b0c77ba3bdaa1d8c304a61f2fa90b5d6ac
author Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Mon Jun 22 01:01:48 2020 -0700
committer GitHub <noreply@github.com> Mon Jun 22 01:01:48 2020 -0700
tree 7eac26165dbb1687a2d8879b2dfec251dc63c4eb
parent 9fe5decf5f38ae247f4f354dee27e4bfbe8bc5f8

bpo-41061: Fix incorrect expressions in hashtable (GH-21028)


Signed-off-by: Christian Heimes <christian@python.org>
(cherry picked from commit 4901ea952691ad70aae21cfe04b6bd363b5a6aff)

Co-authored-by: Christian Heimes <christian@python.org>

Misc/NEWS.d/next/Core and Builtins/2020-06-21-10-54-02.bpo-41061.AHf9MU.rst

diff --git a/Misc/NEWS.d/next/Core and Builtins/2020-06-21-10-54-02.bpo-41061.AHf9MU.rst b/Misc/NEWS.d/next/Core and Builtins/2020-06-21-10-54-02.bpo-41061.AHf9MU.rst
new file mode 100644
index 0000000..b5bb816
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2020-06-21-10-54-02.bpo-41061.AHf9MU.rst
@@ -0,0 +1 @@
+Fix incorrect expressions and asserts in hashtable code and tests.

Modules/_testinternalcapi.c

diff --git a/Modules/_testinternalcapi.c b/Modules/_testinternalcapi.c
index 5f217dc..8faa9fe 100644
--- a/Modules/_testinternalcapi.c
+++ b/Modules/_testinternalcapi.c
@@ -119,8 +119,8 @@
     for (key='a'; key <= 'z'; key++) {
         _Py_hashtable_entry_t *entry = _Py_hashtable_get_entry(table, TO_PTR(key));
         assert(entry != NULL);
-        assert(entry->key = TO_PTR(key));
-        assert(entry->value = TO_PTR(VALUE(key)));
+        assert(entry->key == TO_PTR(key));
+        assert(entry->value == TO_PTR(VALUE(key)));
     }
 
     // Test _Py_hashtable_get()

Python/hashtable.c

diff --git a/Python/hashtable.c b/Python/hashtable.c
index b92e8ca..09501de 100644
--- a/Python/hashtable.c
+++ b/Python/hashtable.c
@@ -133,7 +133,7 @@
 {
     Py_uhash_t key_hash = ht->hash_func(key);
     size_t index = key_hash & (ht->nbuckets - 1);
-    _Py_hashtable_entry_t *entry = entry = TABLE_HEAD(ht, index);
+    _Py_hashtable_entry_t *entry = TABLE_HEAD(ht, index);
     while (1) {
         if (entry == NULL) {
             return NULL;
@@ -155,7 +155,7 @@
 {
     Py_uhash_t key_hash = _Py_hashtable_hash_ptr(key);
     size_t index = key_hash & (ht->nbuckets - 1);
-    _Py_hashtable_entry_t *entry = entry = TABLE_HEAD(ht, index);
+    _Py_hashtable_entry_t *entry = TABLE_HEAD(ht, index);
     while (1) {
         if (entry == NULL) {
             return NULL;