From 394996b519af11284f2e4905f28c4a2a677214cf Mon Sep 17 00:00:00 2001 From: Alexandre Vassalotti Date: Thu, 4 Jun 2009 00:43:04 +0000 Subject: Issue #5373: Remove restriction on null bytes in docstrings of classes. --- Objects/typeobject.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Objects/typeobject.c b/Objects/typeobject.c index 0035f6d..0e79542 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -2178,17 +2178,13 @@ type_new(PyTypeObject *metatype, PyObject *args, PyObject *kwds) char *doc_str; char *tp_doc; - doc_str = _PyUnicode_AsStringAndSize(doc, &len); + doc_str = _PyUnicode_AsString(doc); if (doc_str == NULL) { Py_DECREF(type); return NULL; } - if ((Py_ssize_t)strlen(doc_str) != len) { - PyErr_SetString(PyExc_TypeError, - "__doc__ contains null-bytes"); - Py_DECREF(type); - return NULL; - } + /* Silently truncate the docstring if it contains null bytes. */ + len = strlen(doc_str); tp_doc = (char *)PyObject_MALLOC(len + 1); if (tp_doc == NULL) { Py_DECREF(type); -- cgit v0.12