[Python-checkins] cpython (merge 3.5 -> default): merge 3.5
benjamin.peterson
python-checkins at python.org
Tue Sep 6 22:05:53 EDT 2016
https://hg.python.org/cpython/rev/23b705ec6940
changeset: 103195:23b705ec6940
parent: 103192:4aa6233961e5
parent: 103194:66feda02f2a5
user: Benjamin Peterson <benjamin at python.org>
date: Tue Sep 06 19:04:37 2016 -0700
summary:
merge 3.5
files:
Modules/hashtable.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/Modules/hashtable.c b/Modules/hashtable.c
--- a/Modules/hashtable.c
+++ b/Modules/hashtable.c
@@ -338,7 +338,8 @@
entry->key_hash = key_hash;
Py_MEMCPY((void *)_Py_HASHTABLE_ENTRY_PKEY(entry), pkey, ht->key_size);
- ENTRY_WRITE_PDATA(ht, entry, data_size, data);
+ if (data)
+ ENTRY_WRITE_PDATA(ht, entry, data_size, data);
_Py_slist_prepend(&ht->buckets[index], (_Py_slist_item_t*)entry);
ht->entries++;
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list