diff options
author | Serhiy Storchaka <storchaka@gmail.com> | 2016-05-16 19:15:38 (GMT) |
---|---|---|
committer | Serhiy Storchaka <storchaka@gmail.com> | 2016-05-16 19:15:38 (GMT) |
commit | 7bf36dace8c3d3714dfe5175891612450cb82ce5 (patch) | |
tree | 849617685ed31b4e51b7d7aff8a63759868cd28c /Objects/bytearrayobject.c | |
parent | dc953a507827fb43433e79dad391071a8b48a02f (diff) | |
download | cpython-7bf36dace8c3d3714dfe5175891612450cb82ce5.zip cpython-7bf36dace8c3d3714dfe5175891612450cb82ce5.tar.gz cpython-7bf36dace8c3d3714dfe5175891612450cb82ce5.tar.bz2 |
Issue #27039: Fixed bytearray.remove() for values greater than 127.
Patch by Joe Jevnik.
Diffstat (limited to 'Objects/bytearrayobject.c')
-rw-r--r-- | Objects/bytearrayobject.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c index 5a0480c..277be59 100644 --- a/Objects/bytearrayobject.c +++ b/Objects/bytearrayobject.c @@ -2565,21 +2565,18 @@ static PyObject * bytearray_remove_impl(PyByteArrayObject *self, int value) /*[clinic end generated code: output=d659e37866709c13 input=47560b11fd856c24]*/ { - Py_ssize_t where, n = Py_SIZE(self); + Py_ssize_t n = Py_SIZE(self); char *buf = PyByteArray_AS_STRING(self); + char *where = memchr(buf, value, n); - for (where = 0; where < n; where++) { - if (buf[where] == value) - break; - } - if (where == n) { + if (!where) { PyErr_SetString(PyExc_ValueError, "value not found in bytearray"); return NULL; } if (!_canresize(self)) return NULL; - memmove(buf + where, buf + where + 1, n - where); + memmove(where, where + 1, buf + n - where); if (PyByteArray_Resize((PyObject *)self, n - 1) < 0) return NULL; |