[Python-checkins] CVS: python/dist/src/Objects listobject.c,2.91,2.92

[Guido van Rossum]

Update of /cvsroot/python/python/dist/src/Objects
In directory usw-pr-cvs1:/tmp/cvs-serv942

Modified Files:
	listobject.c 
Log Message:
Fix core dump whenever PyList_Reverse() was called.

This fixes SF bug #132008, reported by Warren J. Hack.

The copyright for this patch (and this patch only) belongs to CNRI, as
part of the (yet to be issued) 1.6.1 release.

This is now checked into the HEAD branch.  Tim will check in a test
case to check for this specific bug, and an assertion in
PyArgs_ParseTuple() to catch similar bugs in the future.


Index: listobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/listobject.c,v
retrieving revision 2.91
retrieving revision 2.92
diff -C2 -r2.91 -r2.92
*** listobject.c	2001/01/17 22:11:59	2.91
--- listobject.c	2001/02/12 22:06:02	2.92
***************
*** 1269,1284 ****
  }
  
! static PyObject *
! listreverse(PyListObject *self, PyObject *args)
  {
  	register PyObject **p, **q;
  	register PyObject *tmp;
  	
- 	if (!PyArg_ParseTuple(args, ":reverse"))
- 		return NULL;
- 
  	if (self->ob_size > 1) {
  		for (p = self->ob_item, q = self->ob_item + self->ob_size - 1;
! 						p < q; p++, q--) {
  			tmp = *p;
  			*p = *q;
--- 1269,1283 ----
  }
  
! static void
! _listreverse(PyListObject *self)
  {
  	register PyObject **p, **q;
  	register PyObject *tmp;
  	
  	if (self->ob_size > 1) {
  		for (p = self->ob_item, q = self->ob_item + self->ob_size - 1;
! 		     p < q;
! 		     p++, q--)
! 		{
  			tmp = *p;
  			*p = *q;
***************
*** 1286,1290 ****
  		}
  	}
! 	
  	Py_INCREF(Py_None);
  	return Py_None;
--- 1285,1296 ----
  		}
  	}
! }
! 
! static PyObject *
! listreverse(PyListObject *self, PyObject *args)
! {
! 	if (!PyArg_ParseTuple(args, ":reverse"))
! 		return NULL;
! 	_listreverse(self);
  	Py_INCREF(Py_None);
  	return Py_None;
***************
*** 1298,1305 ****
  		return -1;
  	}
! 	v = listreverse((PyListObject *)v, (PyObject *)NULL);
! 	if (v == NULL)
! 		return -1;
! 	Py_DECREF(v);
  	return 0;
  }
--- 1304,1308 ----
  		return -1;
  	}
! 	_listreverse((PyListObject *)v);
  	return 0;
  }