Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2024-11-22 13:15:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

stl.h bugfix for std::set, misc. cleanups

Browse Source
This commit is contained in:
Wenzel Jakob 2015-12-18 18:40:22 +01:00
parent dbfaf370a5
commit 4b279327a3
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/pybind11/stl.h
View File

@ -51,7 +51,7 @@ public:
Py_DECREF(list); Py_DECREF(list);
return nullptr; return nullptr;
} }
PyList_SetItem(list, index++, value_); PyList_SET_ITEM(list, index++, value_); // steals a reference
} }
return list; return list;
} }
@ -80,15 +80,12 @@ public:
PyObject *set = PySet_New(nullptr); PyObject *set = PySet_New(nullptr);
for (auto const &value: src) { for (auto const &value: src) {
PyObject *value_ = value_conv::cast(value, policy, parent); PyObject *value_ = value_conv::cast(value, policy, parent);
if (!value_) { if (!value_ || PySet_Add(set, value_) != 0) {
Py_DECREF(set); Py_XDECREF(value_);
return nullptr;
}
if (PySet_Add(set, value) != 0) {
Py_DECREF(value);
Py_DECREF(set); Py_DECREF(set);
return nullptr; return nullptr;
} }
Py_DECREF(value_);
} }
return set; return set;
} }
@ -123,7 +120,7 @@ public:
for (auto const &kv: src) { for (auto const &kv: src) {
PyObject *key = key_conv::cast(kv.first, policy, parent); PyObject *key = key_conv::cast(kv.first, policy, parent);
PyObject *value = value_conv::cast(kv.second, policy, parent); PyObject *value = value_conv::cast(kv.second, policy, parent);
if (!key || !value || PyDict_SetItem(dict, key, value) < 0) { if (!key || !value || PyDict_SetItem(dict, key, value) != 0) {
Py_XDECREF(key); Py_XDECREF(key);
Py_XDECREF(value); Py_XDECREF(value);
Py_DECREF(dict); Py_DECREF(dict);