traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Signed-off-by: Christian Heimes <christian@python.org>
This commit is contained in:
Christian Heimes 2020-06-22 09:41:48 +02:00 committed by GitHub
parent d780fa7931
commit 4901ea9526
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1 @@
Fix incorrect expressions and asserts in hashtable code and tests.

4
Modules/_testinternalcapi.c
View File

@ -197,8 +197,8 @@ test_hashtable(PyObject *self, PyObject *Py_UNUSED(args))
for (key='a'; key <= 'z'; key++) { for (key='a'; key <= 'z'; key++) {
_Py_hashtable_entry_t *entry = _Py_hashtable_get_entry(table, TO_PTR(key)); _Py_hashtable_entry_t *entry = _Py_hashtable_get_entry(table, TO_PTR(key));
assert(entry != NULL); assert(entry != NULL);
assert(entry->key = TO_PTR(key)); assert(entry->key == TO_PTR(key));
assert(entry->value = TO_PTR(VALUE(key))); assert(entry->value == TO_PTR(VALUE(key)));
} }
// Test _Py_hashtable_get() // Test _Py_hashtable_get()

4
Python/hashtable.c
View File

@ -133,7 +133,7 @@ _Py_hashtable_get_entry_generic(_Py_hashtable_t *ht, const void *key)
{ {
Py_uhash_t key_hash = ht->hash_func(key); Py_uhash_t key_hash = ht->hash_func(key);
size_t index = key_hash & (ht->nbuckets - 1); 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) { while (1) {
if (entry == NULL) { if (entry == NULL) {
return NULL; return NULL;
@ -155,7 +155,7 @@ _Py_hashtable_get_entry_ptr(_Py_hashtable_t *ht, const void *key)
{ {
Py_uhash_t key_hash = _Py_hashtable_hash_ptr(key); Py_uhash_t key_hash = _Py_hashtable_hash_ptr(key);
size_t index = key_hash & (ht->nbuckets - 1); 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) { while (1) {
if (entry == NULL) { if (entry == NULL) {
return NULL; return NULL;