Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Correctly handle \x00 when sharing bytes.
  • Loading branch information
ericsnowcurrently committed May 16, 2018
commit cb41fa51ba99e67d6a60107966bc3517affc3414
4 changes: 4 additions & 0 deletions Lib/test/test__xxsubinterpreters.py
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,10 @@ def test_types(self):
self.cid,
])

def test_bytes(self):
self._assert_values(i.to_bytes(2, 'little', signed=True)
for i in range(-1, 258))

def test_int(self):
self._assert_values(range(-1, 258))

Expand Down
16 changes: 13 additions & 3 deletions Python/pystate.c
Original file line number Diff line number Diff line change
Expand Up @@ -1332,19 +1332,29 @@ _PyCrossInterpreterData_Lookup(PyObject *obj)

/* cross-interpreter data for builtin types */

struct _shared_bytes_data {
char *bytes;
Py_ssize_t len;
};

static PyObject *
_new_bytes_object(_PyCrossInterpreterData *data)
{
return PyBytes_FromString((char *)(data->data));
struct _shared_bytes_data *shared = (struct _shared_bytes_data *)(data->data);
return PyBytes_FromStringAndSize(shared->bytes, shared->len);
}

static int
_bytes_shared(PyObject *obj, _PyCrossInterpreterData *data)
{
data->data = (void *)(PyBytes_AS_STRING(obj));
struct _shared_bytes_data *shared = PyMem_NEW(struct _shared_bytes_data, 1);
if (PyBytes_AsStringAndSize(obj, &shared->bytes, &shared->len) < 0) {
return -1;
}
data->data = (void *)shared;
data->obj = obj; // Will be "released" (decref'ed) when data released.
data->new_object = _new_bytes_object;
data->free = NULL; // Do not free the data (it belongs to the object).
data->free = PyMem_Free;
return 0;
}

Expand Down