Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Forgot to submit this earlier; it's needed to make test_threading pass.

This commit is contained in:
Guido van Rossum 2007-07-09 14:28:11 +00:00
parent 65b6a80f19
commit 867bcbcd6d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Modules/_ctypes/_ctypes.c
View File

@ -797,14 +797,14 @@ CharArray_set_value(CDataObject *self, PyObject *value)
conversion_mode_errors);
if (!value)
return -1;
} else if (!PyString_Check(value)) {
} else if (!PyBytes_Check(value)) {
PyErr_Format(PyExc_TypeError,
"string expected instead of %s instance",
"str/bytes expected instead of %s instance",
value->ob_type->tp_name);
return -1;
} else
Py_INCREF(value);
size = PyString_GET_SIZE(value);
size = PyBytes_GET_SIZE(value);
if (size > self->b_size) {
PyErr_SetString(PyExc_ValueError,
"string too long");
@ -812,7 +812,7 @@ CharArray_set_value(CDataObject *self, PyObject *value)
return -1;
}
ptr = PyString_AS_STRING(value);
ptr = PyBytes_AS_STRING(value);
memcpy(self->b_ptr, ptr, size);
if (size < self->b_size)
self->b_ptr[size] = '\0';