From ff2c4409217d415659b6fd843752a98369b1418b Mon Sep 17 00:00:00 2001 From: wiredfool Date: Tue, 22 Aug 2017 04:04:35 -0700 Subject: [PATCH] Additional replacements of s# with PY_ARG_BYTES_LENGTH --- _imagingft.c | 3 ++- _webp.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/_imagingft.c b/_imagingft.c index 3eb8bc0b7..21188996d 100644 --- a/_imagingft.c +++ b/_imagingft.c @@ -121,7 +121,8 @@ getfont(PyObject* self_, PyObject* args, PyObject* kw) return NULL; } - if (!PyArg_ParseTupleAndKeywords(args, kw, "eti|iss#i", kwlist, + if (!PyArg_ParseTupleAndKeywords(args, kw, "eti|is"PY_ARG_BYTES_LENGTH"i", + kwlist, Py_FileSystemDefaultEncoding, &filename, &size, &index, &encoding, &font_bytes, &font_bytes_size, &layout_engine)) { diff --git a/_webp.c b/_webp.c index 3ba8fcb9a..260f2182b 100644 --- a/_webp.c +++ b/_webp.c @@ -26,7 +26,7 @@ PyObject* WebPEncode_wrapper(PyObject* self, PyObject* args) Py_ssize_t exif_size; size_t ret_size; - if (!PyArg_ParseTuple(args, "s#iiifss#s#", + if (!PyArg_ParseTuple(args, PY_ARG_BYTES_LENGTH"iiifss#s#", (char**)&rgb, &size, &width, &height, &lossless, &quality_factor, &mode, &icc_bytes, &icc_size, &exif_bytes, &exif_size)) { return NULL;