[Python-checkins] cpython (3.1): Fix obscure set crashers (#8420). Backport of d56b3cafb1e6, reviewed by (original) (raw)

eric.araujo python-checkins at python.org
Wed Mar 23 04:53:53 CET 2011

• Previous message: [Python-checkins] cpython: Do not touch sys.path when site is imported and python was started with -S.
• Next message: [Python-checkins] cpython (merge 3.1 -> 3.2): Merge from 3.1.
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

http://hg.python.org/cpython/rev/57657393ceaf changeset: 68860:57657393ceaf branch: 3.1 parent: 68852:6853b480e388 user: Éric Araujo <merwok at netwok.org> date: Wed Mar 23 02:08:07 2011 +0100 summary: Fix obscure set crashers (#8420). Backport of d56b3cafb1e6, reviewed by Raymond.

files: Lib/test/test_set.py Objects/setobject.c

diff --git a/Lib/test/test_set.py b/Lib/test/test_set.py --- a/Lib/test/test_set.py +++ b/Lib/test/test_set.py @@ -1660,6 +1660,39 @@ self.assertRaises(TypeError, getattr(set('january'), methname), N(data)) self.assertRaises(ZeroDivisionError, getattr(set('january'), methname), E(data))

+class bad_eq:

• def eq(self, other):

•    if be_bad:

•        set2.clear()

•        raise ZeroDivisionError

•    return self is other

• def hash(self):

•    return 0

• +class bad_dict_clear:
• def eq(self, other):

•    if be_bad:

•        dict2.clear()

•    return self is other

• def hash(self):

•    return 0

• +class TestWeirdBugs(unittest.TestCase):
• def test_8420_set_merge(self):

•    # This used to segfault

•    global be_bad, set2, dict2

•    be_bad = False

•    set1 = {bad_eq()}

•    set2 = {bad_eq() for i in range(75)}

•    be_bad = True

•    self.assertRaises(ZeroDivisionError, set1.update, set2)

•    be_bad = False

•    set1 = {bad_dict_clear()}

•    dict2 = {bad_dict_clear(): None}

•    be_bad = True

•    set1.symmetric_difference_update(dict2)

• Application tests (based on David Eppstein's graph recipes ====================================

  def powerset(U):

@@ -1804,6 +1837,7 @@ TestIdentities, TestVariousIteratorArgs, TestGraphs,

•    TestWeirdBugs,
     )

  support.run_unittest(*test_classes)

diff --git a/Objects/setobject.c b/Objects/setobject.c --- a/Objects/setobject.c +++ b/Objects/setobject.c @@ -364,12 +364,14 @@ 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 @@ set_merge(PySetObject *so, PyObject *otherset) { PySetObject *other;
• PyObject *key;
• long hash; register Py_ssize_t i; register setentry *entry;

@@ -657,11 +661,13 @@ } 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 @@ 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)

•            if (set_add_entry(so, &an_entry) == -1) {

•                Py_DECREF(key);
                 return NULL;

•            }
         }

•        Py_DECREF(key);
     }
     Py_RETURN_NONE;

  }

-- Repository URL: http://hg.python.org/cpython

• Previous message: [Python-checkins] cpython: Do not touch sys.path when site is imported and python was started with -S.
• Next message: [Python-checkins] cpython (merge 3.1 -> 3.2): Merge from 3.1.
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

More information about the Python-checkins mailing list