diff options
| author | An Long <aisk@users.noreply.github.com> | 2020-06-13 12:26:01 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-13 12:26:01 (GMT) |
| commit | 29c117202e386bad1d66ae336e2fefa1a1809ee0 (patch) | |
| tree | 4d8c790491cc3b3ff3bcbff7b80ebe2f7853d760 | |
| parent | 1c209e3b53b6929747fe3b79398bfbaeabb72d92 (diff) | |
| download | cpython-29c117202e386bad1d66ae336e2fefa1a1809ee0.zip cpython-29c117202e386bad1d66ae336e2fefa1a1809ee0.tar.gz cpython-29c117202e386bad1d66ae336e2fefa1a1809ee0.tar.bz2 | |
bpo-40834: Fix truncate when sending str object with channel (GH-20555)
| -rw-r--r-- | Lib/test/test__xxsubinterpreters.py | 3 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2020-05-31-15-52-18.bpo-40834.MO9_hb.rst | 1 | ||||
| -rw-r--r-- | Python/pystate.c | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/Lib/test/test__xxsubinterpreters.py b/Lib/test/test__xxsubinterpreters.py index e17bfde..7aec021 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 0000000..2727837 --- /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 72d8b36..d0cbf5c 100644 --- a/Python/pystate.c +++ b/Python/pystate.c @@ -1726,7 +1726,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. |