From: Raymond Hettinger <python@rcn.com>
Date: Thu, 16 Jul 2015 06:52:29 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.6.0a1~1966
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d702044bcdb0678cb0ba96235c43ffcaa737214c;p=thirdparty%2FPython%2Fcpython.git

merge
---

d702044bcdb0678cb0ba96235c43ffcaa737214c
diff --cc Objects/setobject.c
index e6fb46e6e24d,704d7e2b2a76..922c61968ef3
--- a/Objects/setobject.c
+++ b/Objects/setobject.c
@@@ -668,11 -600,15 +668,12 @@@ set_merge(PySetObject *so, PyObject *ot
      }
  
      /* We can't assure there are no duplicates, so do normal insertions */
-     for (i = 0; i <= other->mask; i++, other_entry++) {
+     for (i = 0; i <= other->mask; i++) {
+         other_entry = &other->table[i];
          key = other_entry->key;
          if (key != NULL && key != dummy) {
 -            Py_INCREF(key);
 -            if (set_insert_key(so, key, other_entry->hash)) {
 -                Py_DECREF(key);
 +            if (set_add_entry(so, key, other_entry->hash))
                  return -1;
 -            }
          }
      }
      return 0;