summaryrefslogtreecommitdiffstatshomepage
path: root/py/objset.c
diff options
context:
space:
mode:
authorAndrew Scheller <github@loowis.durge.org>2014-04-07 01:41:24 +0100
committerAndrew Scheller <github@loowis.durge.org>2014-04-07 01:41:24 +0100
commit5e443f4b708ba2984f7f04bfec17ea90310b1123 (patch)
tree90569d7d4e8f8de3b800877776ad5df717eebc17 /py/objset.c
parent902d9552c551a14821fbf9a801eb2174fcd04dbb (diff)
parent2bfd2dc77091bee94723c36216dee652bcc8a054 (diff)
downloadmicropython-5e443f4b708ba2984f7f04bfec17ea90310b1123.tar.gz
micropython-5e443f4b708ba2984f7f04bfec17ea90310b1123.zip
Merge remote-tracking branch 'upstream/master' into makefile-tweaks
Diffstat (limited to 'py/objset.c')
-rw-r--r--py/objset.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/py/objset.c b/py/objset.c
index 9a7e6751f5..448f484d5a 100644
--- a/py/objset.c
+++ b/py/objset.c
@@ -128,7 +128,7 @@ STATIC mp_obj_t set_copy(mp_obj_t self_in) {
mp_obj_set_t *other = m_new_obj(mp_obj_set_t);
other->base.type = &mp_type_set;
- mp_set_init(&other->set, self->set.alloc - 1);
+ mp_set_init(&other->set, self->set.alloc);
other->set.used = self->set.used;
memcpy(other->set.table, self->set.table, self->set.alloc * sizeof(mp_obj_t));