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

Merged revisions 78185 via svnmerge from

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

................
  r78185 | mark.dickinson | 2010-02-14 12:53:32 +0000 (Sun, 14 Feb 2010) | 13 lines

  Merged revisions 78183-78184 via svnmerge from
  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:09:30 +00:00
parent db01a3e71c
commit 5a41a4c235
2 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Objects/bytearrayobject.c
View file

@ -664,7 +664,7 @@ bytearray_ass_subscript(PyByteArrayObject *self, PyObject *index, PyObject *valu
i < slicelen; cur += step, i++) {
Py_ssize_t lim = step - 1;
if (cur + step >= PyByteArray_GET_SIZE(self))
if (cur + step >= (size_t)PyByteArray_GET_SIZE(self))
lim = PyByteArray_GET_SIZE(self) - cur - 1;
memmove(self->ob_bytes + cur - i,
@ -672,7 +672,7 @@ bytearray_ass_subscript(PyByteArrayObject *self, PyObject *index, PyObject *valu
}
/* Move the tail of the bytes, in one chunk */
cur = start + slicelen*step;
if (cur < PyByteArray_GET_SIZE(self)) {
if (cur < (size_t)PyByteArray_GET_SIZE(self)) {
memmove(self->ob_bytes + cur - slicelen,
self->ob_bytes + cur,
PyByteArray_GET_SIZE(self) - cur);
@ -852,13 +852,14 @@ bytearray_repr(PyByteArrayObject *self)
const char *quote_postfix = ")";
Py_ssize_t length = Py_SIZE(self);
/* 14 == strlen(quote_prefix) + 2 + strlen(quote_postfix) */
size_t newsize = 14 + 4 * length;
size_t newsize;
PyObject *v;
if (newsize > PY_SSIZE_T_MAX || newsize / 4 - 3 != length) {
if (length > (PY_SSIZE_T_MAX - 14) / 4) {
PyErr_SetString(PyExc_OverflowError,
"bytearray object is too large to make repr");
return NULL;
}
newsize = 14 + 4 * length;
v = PyUnicode_FromUnicode(NULL, newsize);
if (v == NULL) {
return NULL;