mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

string_join(): Some cleaning up of reference counting. In the

Browse source 
seqlen==1 clause, before returning item, we need to DECREF seq.  In
the res=PyString... failure clause, we need to goto finally to also
decref seq (and the DECREF of res in finally is changed to a
XDECREF).  Also, we need to DECREF seq just before the
PyUnicode_Join() return.
This commit is contained in:
Barry Warsaw 2000-07-11 04:58:12 +00:00
parent 20f41b6456
commit 771d0675b6
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Objects/stringobject.c
View file

@ -749,24 +749,27 @@ string_join(PyStringObject *self, PyObject *args)
if (!PyArg_ParseTuple(args, "O:join", &orig))
return NULL;
seq = PySequence_Fast(orig, "");
if (seq == NULL) {
if (!(seq = PySequence_Fast(orig, ""))) {
if (PyErr_ExceptionMatches(PyExc_TypeError))
PyErr_Format(PyExc_TypeError,
"sequence expected, %.80s found",
orig->ob_type->tp_name);
return NULL;
}
/* From here on out, errors go through finally: for proper
* reference count manipulations.
*/
seqlen = PySequence_Length(seq);
if (seqlen == 1) {
item = PySequence_Fast_GET_ITEM(seq, 0);
Py_INCREF(item);
Py_DECREF(seq);
return item;
}
if (!(res = PyString_FromStringAndSize((char*)NULL, sz)))
return NULL;
goto finally;
p = PyString_AsString(res);
for (i = 0; i < seqlen; i++) {
@ -774,8 +777,8 @@ string_join(PyStringObject *self, PyObject *args)
if (!PyString_Check(item)){
if (PyUnicode_Check(item)) {
Py_DECREF(res);
return PyUnicode_Join((PyObject *)self,
seq);
Py_DECREF(seq);
return PyUnicode_Join((PyObject *)self, seq);
}
PyErr_Format(PyExc_TypeError,
"sequence item %i: expected string, %.80s found",
@ -806,7 +809,7 @@ string_join(PyStringObject *self, PyObject *args)
finally:
Py_DECREF(seq);
Py_DECREF(res);
Py_XDECREF(res);
return NULL;
}