From 4b279327a3d416687d6558e4b6fef8ee5486a710 Mon Sep 17 00:00:00 2001
From: Wenzel Jakob <wenzel@inf.ethz.ch>
Date: Fri, 18 Dec 2015 18:40:22 +0100
Subject: [PATCH] stl.h bugfix for std::set, misc. cleanups

---
 include/pybind11/stl.h | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/include/pybind11/stl.h b/include/pybind11/stl.h
index 364ad6537..63e7fdc43 100644
--- a/include/pybind11/stl.h
+++ b/include/pybind11/stl.h
@@ -51,7 +51,7 @@ public:
                 Py_DECREF(list);
                 return nullptr;
             }
-            PyList_SetItem(list, index++, value_);
+            PyList_SET_ITEM(list, index++, value_); // steals a reference
         }
         return list;
     }
@@ -80,15 +80,12 @@ public:
         PyObject *set = PySet_New(nullptr);
         for (auto const &value: src) {
             PyObject *value_ = value_conv::cast(value, policy, parent);
-            if (!value_) {
-                Py_DECREF(set);
-                return nullptr;
-            }
-            if (PySet_Add(set, value) != 0) {
-                Py_DECREF(value);
+            if (!value_ || PySet_Add(set, value_) != 0) {
+                Py_XDECREF(value_);
                 Py_DECREF(set);
                 return nullptr;
             }
+            Py_DECREF(value_);
         }
         return set;
     }
@@ -123,7 +120,7 @@ public:
         for (auto const &kv: src) {
             PyObject *key   = key_conv::cast(kv.first, 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(value);
                 Py_DECREF(dict);