aboutsummaryrefslogtreecommitdiffstats
path: root/contrib/tools/python3/Modules/_io/stringio.c
diff options
context:
space:
mode:
authorshadchin <shadchin@yandex-team.com>2024-12-23 19:39:02 +0300
committershadchin <shadchin@yandex-team.com>2024-12-23 19:54:20 +0300
commit65a5bf9d37a3b29eb394f560b9a09318196c40e8 (patch)
treee5cd68fb0682b2388e52d9806bb87adc348e21a8 /contrib/tools/python3/Modules/_io/stringio.c
parenta1dd87a52878ab3e46e5fd2dba5ecbba6113d7e0 (diff)
downloadydb-65a5bf9d37a3b29eb394f560b9a09318196c40e8.tar.gz
Update Python 3 to 3.12.8
commit_hash:c20045b8a987d8720e1f3328270357491d5530f3
Diffstat (limited to 'contrib/tools/python3/Modules/_io/stringio.c')
-rw-r--r--contrib/tools/python3/Modules/_io/stringio.c30
1 files changed, 16 insertions, 14 deletions
diff --git a/contrib/tools/python3/Modules/_io/stringio.c b/contrib/tools/python3/Modules/_io/stringio.c
index 568d0bd709..ed9cf0da91 100644
--- a/contrib/tools/python3/Modules/_io/stringio.c
+++ b/contrib/tools/python3/Modules/_io/stringio.c
@@ -884,23 +884,25 @@ stringio_setstate(stringio *self, PyObject *state)
once by __init__. So we do not take any chance and replace object's
buffer completely. */
{
- PyObject *item;
- Py_UCS4 *buf;
- Py_ssize_t bufsize;
-
- item = PyTuple_GET_ITEM(state, 0);
- buf = PyUnicode_AsUCS4Copy(item);
- if (buf == NULL)
- return NULL;
- bufsize = PyUnicode_GET_LENGTH(item);
+ PyObject *item = PyTuple_GET_ITEM(state, 0);
+ if (PyUnicode_Check(item)) {
+ Py_UCS4 *buf = PyUnicode_AsUCS4Copy(item);
+ if (buf == NULL)
+ return NULL;
+ Py_ssize_t bufsize = PyUnicode_GET_LENGTH(item);
- if (resize_buffer(self, bufsize) < 0) {
+ if (resize_buffer(self, bufsize) < 0) {
+ PyMem_Free(buf);
+ return NULL;
+ }
+ memcpy(self->buf, buf, bufsize * sizeof(Py_UCS4));
PyMem_Free(buf);
- return NULL;
+ self->string_size = bufsize;
+ }
+ else {
+ assert(item == Py_None);
+ self->string_size = 0;
}
- memcpy(self->buf, buf, bufsize * sizeof(Py_UCS4));
- PyMem_Free(buf);
- self->string_size = bufsize;
}
/* Set carefully the position value. Alternatively, we could use the seek