Merge pull request #101 from cwalther/sdlsetindex-huru

Don’t modify tuples that others may already have references to
H-uru · Nov 26, 2011 · 1c776f3 · 1c776f3
2 parents d5bd503 + e2905b6
commit 1c776f3
Showing 1 changed file with 18 additions and 0 deletions.
diff --git a/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.cpp b/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.cpp
@@ -208,6 +208,22 @@ void plPythonSDLModifier::SetItemIdx(const char* key, int idx, PyObject* value,
         return;
     }
 
+    if (pyTuple && pyTuple->ob_refcnt != 1)
+    {
+        // others already have references to the tuple and expect it to be immutable, must make a copy
+        int n = PyTuple_Size(pyTuple);
+        PyObject* newTuple = PyTuple_New(n);
+        for (int j = 0; j < n; j++)
+        {
+            PyObject* item = PyTuple_GetItem(pyTuple, j);
+            Py_INCREF(item);
+            PyTuple_SetItem(newTuple, j, item);
+        }
+        Py_DECREF(pyTuple);
+        pyTuple = newTuple;
+        it->second.obj = newTuple;
+    }
+
     if (pyTuple)
     {
         if (PyTuple_Size(pyTuple) <= idx)
@@ -221,6 +237,8 @@ void plPythonSDLModifier::SetItemIdx(const char* key, int idx, PyObject* value,
                 Py_INCREF(Py_None);
                 PyTuple_SetItem(pyTuple, j, Py_None);
             }
+            // _PyTuple_Resize may have changed pyTuple
+            it->second.obj = pyTuple;
         }
     }
     else