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

Backport rev. 51798 from trunk: 

fix setobject.c refcounts and error checks.
This commit is contained in:
Georg Brandl 2006-09-08 06:02:26 +00:00
parent 137ae0cf7c
commit 8de403a56a
1 changed files with 35 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Objects/setobject.c
View File

@ -319,8 +319,10 @@ set_add_entry(register PySetObject *so, setentry *entry)
assert(so->fill <= so->mask); /* at least one empty slot */ assert(so->fill <= so->mask); /* at least one empty slot */
n_used = so->used; n_used = so->used;
Py_INCREF(entry->key); Py_INCREF(entry->key);
if (set_insert_key(so, entry->key, entry->hash) == -1) if (set_insert_key(so, entry->key, entry->hash) == -1) {
Py_DECREF(entry->key);
return -1; return -1;
}
if (!(so->used > n_used && so->fill*3 >= (so->mask+1)*2)) if (!(so->used > n_used && so->fill*3 >= (so->mask+1)*2))
return 0; return 0;
return set_table_resize(so, so->used>50000 ? so->used*2 : so->used*4); return set_table_resize(so, so->used>50000 ? so->used*2 : so->used*4);
@ -1138,7 +1140,12 @@ set_intersection(PySetObject *so, PyObject *other)
} }
while (set_next((PySetObject *)other, &pos, &entry)) { while (set_next((PySetObject *)other, &pos, &entry)) {
if (set_contains_entry(so, entry)) { int rv = set_contains_entry(so, entry);
if (rv == -1) {
Py_DECREF(result);
return NULL;
}
if (rv) {
if (set_add_entry(result, entry) == -1) { if (set_add_entry(result, entry) == -1) {
Py_DECREF(result); Py_DECREF(result);
return NULL; return NULL;
@ -1155,7 +1162,14 @@ set_intersection(PySetObject *so, PyObject *other)
} }
while ((key = PyIter_Next(it)) != NULL) { while ((key = PyIter_Next(it)) != NULL) {
if (set_contains_key(so, key)) { int rv = set_contains_key(so, key);
if (rv == -1) {
Py_DECREF(it);
Py_DECREF(result);
Py_DECREF(key);
return NULL;
}
if (rv) {
if (set_add_key(result, key) == -1) { if (set_add_key(result, key) == -1) {
Py_DECREF(it); Py_DECREF(it);
Py_DECREF(result); Py_DECREF(result);
@ -1232,7 +1246,8 @@ set_difference_update_internal(PySetObject *so, PyObject *other)
Py_ssize_t pos = 0; Py_ssize_t pos = 0;
while (set_next((PySetObject *)other, &pos, &entry)) while (set_next((PySetObject *)other, &pos, &entry))
set_discard_entry(so, entry); if (set_discard_entry(so, entry) == -1)
return -1;
} else { } else {
PyObject *key, *it; PyObject *key, *it;
it = PyObject_GetIter(other); it = PyObject_GetIter(other);
@ -1295,18 +1310,27 @@ set_difference(PySetObject *so, PyObject *other)
entrycopy.hash = entry->hash; entrycopy.hash = entry->hash;
entrycopy.key = entry->key; entrycopy.key = entry->key;
if (!PyDict_Contains(other, entry->key)) { if (!PyDict_Contains(other, entry->key)) {
if (set_add_entry((PySetObject *)result, &entrycopy) == -1) if (set_add_entry((PySetObject *)result, &entrycopy) == -1) {
Py_DECREF(result);
return NULL; return NULL;
} }
} }
}
return result; return result;
} }
while (set_next(so, &pos, &entry)) { while (set_next(so, &pos, &entry)) {
if (!set_contains_entry((PySetObject *)other, entry)) { int rv = set_contains_entry((PySetObject *)other, entry);
if (set_add_entry((PySetObject *)result, entry) == -1) if (rv == -1) {
Py_DECREF(result);
return NULL; return NULL;
} }
if (!rv) {
if (set_add_entry((PySetObject *)result, entry) == -1) {
Py_DECREF(result);
return NULL;
}
}
} }
return result; return result;
} }
@ -1464,7 +1488,10 @@ set_issubset(PySetObject *so, PyObject *other)
Py_RETURN_FALSE; Py_RETURN_FALSE;
while (set_next(so, &pos, &entry)) { while (set_next(so, &pos, &entry)) {
if (!set_contains_entry((PySetObject *)other, entry)) int rv = set_contains_entry((PySetObject *)other, entry);
if (rv == -1)
return NULL;
if (!rv)
Py_RETURN_FALSE; Py_RETURN_FALSE;
} }
Py_RETURN_TRUE; Py_RETURN_TRUE;