SF patch #102548, fix for bug #121013, by mwh@users.sourceforge.net.

Fixes a typo that caused "".join(u"this is a test") to dump core.

diff --git a/Objects/stringobject.c b/Objects/stringobject.c
index 757c1c4da4b9d17595d5ed2ad7d3c23722b740fb..31d1b05c60317cc0a0e4ddbd8897ec272c447214 100644 (file)
--- a/Objects/stringobject.c
+++ b/Objects/stringobject.c
@@ -835,7 +835,7 @@ string_join(PyStringObject *self, PyObject *args)
                        if (PyUnicode_Check(item)) {
                                Py_DECREF(res);
                                Py_DECREF(seq);
-                               return PyUnicode_Join((PyObject *)self, seq);
+                               return PyUnicode_Join((PyObject *)self, orig);
                        }
                        PyErr_Format(PyExc_TypeError,
                                     "sequence item %i: expected string,"