Mercurial > public > mercurial-scm > hg
diff contrib/python-zstandard/c-ext/bufferutil.c @ 37495:b1fb341d8a61
zstandard: vendor python-zstandard 0.9.0
This was just released. It features a number of goodies. More info at
https://gregoryszorc.com/blog/2018/04/09/release-of-python-zstandard-0.9/.
The clang-format ignore list was updated to reflect the new source
of files.
The project contains a vendored copy of zstandard 1.3.4. The old
version was 1.1.3. One of the changes between those versions is that
zstandard is now dual licensed BSD + GPLv2 and the patent rights grant
has been removed. Good riddance.
The API should be backwards compatible. So no changes in core
should be needed. However, there were a number of changes in the
library that we'll want to adapt to. Those will be addressed in
subsequent commits.
Differential Revision: https://phab.mercurial-scm.org/D3198
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Mon, 09 Apr 2018 10:13:29 -0700 |
| parents | e0dc40530c5a |
| children | e92ca942ddca |
line wrap: on
line diff
--- a/contrib/python-zstandard/c-ext/bufferutil.c Sun Apr 08 01:08:43 2018 +0200 +++ b/contrib/python-zstandard/c-ext/bufferutil.c Mon Apr 09 10:13:29 2018 -0700 @@ -83,7 +83,7 @@ } if (segments.len % sizeof(BufferSegment)) { - PyErr_Format(PyExc_ValueError, "segments array size is not a multiple of %lu", + PyErr_Format(PyExc_ValueError, "segments array size is not a multiple of %zu", sizeof(BufferSegment)); goto except; } @@ -123,7 +123,7 @@ PyBuffer_Release(&self->parent); PyBuffer_Release(&segments); return -1; -}; +} /** * Construct a BufferWithSegments from existing memory and offsets. @@ -188,6 +188,12 @@ return NULL; } + if (self->segments[i].length > PY_SSIZE_T_MAX) { + PyErr_Format(PyExc_ValueError, + "item at offset %zd is too large for this platform", i); + return NULL; + } + result = (ZstdBufferSegment*)PyObject_CallObject((PyObject*)&ZstdBufferSegmentType, NULL); if (NULL == result) { return NULL; @@ -197,7 +203,7 @@ Py_INCREF(self); result->data = (char*)self->data + self->segments[i].offset; - result->dataSize = self->segments[i].length; + result->dataSize = (Py_ssize_t)self->segments[i].length; result->offset = self->segments[i].offset; return result; @@ -205,7 +211,13 @@ #if PY_MAJOR_VERSION >= 3 static int BufferWithSegments_getbuffer(ZstdBufferWithSegments* self, Py_buffer* view, int flags) { - return PyBuffer_FillInfo(view, (PyObject*)self, self->data, self->dataSize, 1, flags); + if (self->dataSize > PY_SSIZE_T_MAX) { + view->obj = NULL; + PyErr_SetString(PyExc_BufferError, "buffer is too large for this platform"); + return -1; + } + + return PyBuffer_FillInfo(view, (PyObject*)self, self->data, (Py_ssize_t)self->dataSize, 1, flags); } #else static Py_ssize_t BufferWithSegments_getreadbuffer(ZstdBufferWithSegments* self, Py_ssize_t segment, void **ptrptr) { @@ -214,8 +226,13 @@ return -1; } + if (self->dataSize > PY_SSIZE_T_MAX) { + PyErr_SetString(PyExc_ValueError, "buffer is too large for this platform"); + return -1; + } + *ptrptr = self->data; - return self->dataSize; + return (Py_ssize_t)self->dataSize; } static Py_ssize_t BufferWithSegments_getsegcount(ZstdBufferWithSegments* self, Py_ssize_t* len) { @@ -232,7 +249,12 @@ ); static PyObject* BufferWithSegments_tobytes(ZstdBufferWithSegments* self) { - return PyBytes_FromStringAndSize(self->data, self->dataSize); + if (self->dataSize > PY_SSIZE_T_MAX) { + PyErr_SetString(PyExc_ValueError, "buffer is too large for this platform"); + return NULL; + } + + return PyBytes_FromStringAndSize(self->data, (Py_ssize_t)self->dataSize); } PyDoc_STRVAR(BufferWithSegments_segments__doc__,