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

Merged revisions 78183-78184 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78183 | mark.dickinson | 2010-02-14 12:16:43 +0000 (Sun, 14 Feb 2010) | 1 line

  Silence some 'comparison between signed and unsigned' compiler warnings.
........
  r78184 | mark.dickinson | 2010-02-14 12:31:26 +0000 (Sun, 14 Feb 2010) | 1 line

  Silence more compiler warnings;  fix an instance of potential undefined behaviour from signed overflow.
........
This commit is contained in:
Mark Dickinson 2010-02-14 13:08:35 +00:00
parent 71e38f57f3
commit a920961673
2 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Objects/listobject.c
View file

@ -126,11 +126,11 @@ PyList_New(Py_ssize_t size)
PyErr_BadInternalCall();
return NULL;
}
nbytes = size * sizeof(PyObject *);
/* Check for overflow without an actual overflow,
* which can cause compiler to optimise out */
if (size > PY_SIZE_MAX / sizeof(PyObject *))
if ((size_t)size > PY_SIZE_MAX / sizeof(PyObject *))
return PyErr_NoMemory();
nbytes = size * sizeof(PyObject *);
if (numfree) {
numfree--;
op = free_list[numfree];
@ -1426,7 +1426,7 @@ merge_getmem(MergeState *ms, Py_ssize_t need)
* we don't care what's in the block.
*/
merge_freemem(ms);
if (need > PY_SSIZE_T_MAX / sizeof(PyObject*)) {
if ((size_t)need > PY_SSIZE_T_MAX / sizeof(PyObject*)) {
PyErr_NoMemory();
return -1;
}
@ -2616,7 +2616,8 @@ list_ass_subscript(PyListObject* self, PyObject* item, PyObject* value)
step = -step;
}
assert(slicelength <= PY_SIZE_MAX / sizeof(PyObject*));
assert((size_t)slicelength <=
PY_SIZE_MAX / sizeof(PyObject*));
garbage = (PyObject**)
PyMem_MALLOC(slicelength*sizeof(PyObject*));
@ -2632,13 +2633,13 @@ list_ass_subscript(PyListObject* self, PyObject* item, PyObject* value)
and then tail end of the list that was not
covered by the slice */
for (cur = start, i = 0;
cur < stop;
cur < (size_t)stop;
cur += step, i++) {
Py_ssize_t lim = step - 1;
garbage[i] = PyList_GET_ITEM(self, cur);
if (cur + step >= Py_SIZE(self)) {
if (cur + step >= (size_t)Py_SIZE(self)) {
lim = Py_SIZE(self) - cur - 1;
}
@ -2647,7 +2648,7 @@ list_ass_subscript(PyListObject* self, PyObject* item, PyObject* value)
lim * sizeof(PyObject *));
}
cur = start + slicelength*step;
if (cur < Py_SIZE(self)) {
if (cur < (size_t)Py_SIZE(self)) {
memmove(self->ob_item + cur - slicelength,
self->ob_item + cur,
(Py_SIZE(self) - cur) *