From 94bb4b7db2a4eadd299acede204b087aca30c9a2 Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Sat, 13 Jun 2020 05:44:38 -0700 Subject: [PATCH] bpo-40834: Fix truncate when sending str object with channel (GH-20555) (cherry picked from commit 29c117202e386bad1d66ae336e2fefa1a1809ee0) Co-authored-by: An Long --- Lib/test/test__xxsubinterpreters.py | 3 +++ .../next/Library/2020-05-31-15-52-18.bpo-40834.MO9_hb.rst | 1 + Python/pystate.c | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 Misc/NEWS.d/next/Library/2020-05-31-15-52-18.bpo-40834.MO9_hb.rst diff --git a/Lib/test/test__xxsubinterpreters.py b/Lib/test/test__xxsubinterpreters.py index e17bfde2c2f..7aec021fb19 100644 --- a/Lib/test/test__xxsubinterpreters.py +++ b/Lib/test/test__xxsubinterpreters.py @@ -378,6 +378,9 @@ class ShareableTypeTests(unittest.TestCase): self._assert_values(i.to_bytes(2, 'little', signed=True) for i in range(-1, 258)) + def test_strs(self): + self._assert_values(['hello world', '你好世界', '']) + def test_int(self): self._assert_values(itertools.chain(range(-1, 258), [sys.maxsize, -sys.maxsize - 1])) diff --git a/Misc/NEWS.d/next/Library/2020-05-31-15-52-18.bpo-40834.MO9_hb.rst b/Misc/NEWS.d/next/Library/2020-05-31-15-52-18.bpo-40834.MO9_hb.rst new file mode 100644 index 00000000000..272783773ff --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-05-31-15-52-18.bpo-40834.MO9_hb.rst @@ -0,0 +1 @@ +Fix truncate when sending str object with_xxsubinterpreters.channel_send. \ No newline at end of file diff --git a/Python/pystate.c b/Python/pystate.c index 071b976ff63..9beefa8e20c 100644 --- a/Python/pystate.c +++ b/Python/pystate.c @@ -1708,7 +1708,7 @@ _str_shared(PyObject *obj, _PyCrossInterpreterData *data) struct _shared_str_data *shared = PyMem_NEW(struct _shared_str_data, 1); shared->kind = PyUnicode_KIND(obj); shared->buffer = PyUnicode_DATA(obj); - shared->len = PyUnicode_GET_LENGTH(obj) - 1; + shared->len = PyUnicode_GET_LENGTH(obj); data->data = (void *)shared; Py_INCREF(obj); data->obj = obj; // Will be "released" (decref'ed) when data released.