Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Fix for SF bug 117402, crashes on str(array) and repr(array). This was an 

unfortunate consequence of somebody switching from PyArg_Parse to
PyArg_ParseTuple but without changing the argument from a NULL to a tuple.
This commit is contained in:
Tim Peters 2000-11-10 19:04:19 +00:00
parent e5cd584b9f
commit 7c1cb46126
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Modules/arraymodule.c
View File

@ -1191,7 +1191,6 @@ array_print(arrayobject *a, FILE *fp, int flags)
{
int ok = 0;
int i, len;
PyObject *t_empty = PyTuple_New(0);
PyObject *v;
len = a->ob_size;
if (len == 0) {
@ -1199,9 +1198,10 @@ array_print(arrayobject *a, FILE *fp, int flags)
return ok;
}
if (a->ob_descr->typecode == 'c') {
PyObject *t_empty = PyTuple_New(0);
fprintf(fp, "array('c', ");
v = array_tostring(a, t_empty);
Py_DECREF(t_empty);;
Py_DECREF(t_empty);
ok = PyObject_Print(v, fp, 0);
Py_XDECREF(v);
fprintf(fp, ")");
@ -1231,9 +1231,11 @@ array_repr(arrayobject *a)
return PyString_FromString(buf);
}
if (a->ob_descr->typecode == 'c') {
PyObject *t_empty = PyTuple_New(0);
sprintf(buf, "array('c', ");
s = PyString_FromString(buf);
v = array_tostring(a, (PyObject *)NULL);
v = array_tostring(a, t_empty);
Py_DECREF(t_empty);
t = PyObject_Repr(v);
Py_XDECREF(v);
PyString_ConcatAndDel(&s, t);