mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Fix obscure set crashers (#8420). Backport of d56b3cafb1e6, reviewed by Raymond.

Browse source
This commit is contained in:
Éric Araujo 2011-03-23 02:08:07 +01:00
parent c706dbfa67
commit 48049911d6
2 changed files with 59 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

37
Objects/setobject.c
View file

@ -364,12 +364,14 @@ static int
set_add_entry(register PySetObject *so, setentry *entry)
{
register Py_ssize_t n_used;
PyObject *key = entry->key;
long hash = entry->hash;
assert(so->fill <= so->mask); /* at least one empty slot */
n_used = so->used;
Py_INCREF(entry->key);
if (set_insert_key(so, entry->key, (long) entry->hash) == -1) {
Py_DECREF(entry->key);
Py_INCREF(key);
if (set_insert_key(so, key, hash) == -1) {
Py_DECREF(key);
return -1;
}
if (!(so->used > n_used && so->fill*3 >= (so->mask+1)*2))
@ -637,6 +639,8 @@ static int
set_merge(PySetObject *so, PyObject *otherset)
{
PySetObject *other;
PyObject *key;
long hash;
register Py_ssize_t i;
register setentry *entry;
@ -657,11 +661,13 @@ set_merge(PySetObject *so, PyObject *otherset)
}
for (i = 0; i <= other->mask; i++) {
entry = &other->table[i];
if (entry->key != NULL &&
entry->key != dummy) {
Py_INCREF(entry->key);
if (set_insert_key(so, entry->key, (long) entry->hash) == -1) {
Py_DECREF(entry->key);
key = entry->key;
hash = entry->hash;
if (key != NULL &&
key != dummy) {
Py_INCREF(key);
if (set_insert_key(so, key, hash) == -1) {
Py_DECREF(key);
return -1;
}
}
@ -1642,15 +1648,22 @@ set_symmetric_difference_update(PySetObject *so, PyObject *other)
while (_PyDict_Next(other, &pos, &key, &value, &hash)) {
setentry an_entry;
Py_INCREF(key);
an_entry.hash = hash;
an_entry.key = key;
rv = set_discard_entry(so, &an_entry);
if (rv == -1)
if (rv == -1) {
Py_DECREF(key);
return NULL;
if (rv == DISCARD_NOTFOUND) {
if (set_add_entry(so, &an_entry) == -1)
return NULL;
}
if (rv == DISCARD_NOTFOUND) {
if (set_add_entry(so, &an_entry) == -1) {
Py_DECREF(key);
return NULL;
}
}
Py_DECREF(key);
}
Py_RETURN_NONE;
}