Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

[3.14] gh-146056: Fix repr() for lists and tuples containing NULLs (GH-146129) (alt)#146204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Closed
Show file tree
Hide file tree
Changes fromall commits
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
7 changes: 5 additions & 2 deletionsDoc/c-api/file.rst
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,9 +123,12 @@ the :mod:`io` APIs instead.
Write object *obj* to file object *p*. The only supported flag for *flags* is
:c:macro:`Py_PRINT_RAW`; if given, the:func:`str` of the object is written
instead of the:func:`repr`. Return ``0`` on success or ``-1`` on failure; the
appropriate exception will be set.
instead of the:func:`repr`.
If *obj* is ``NULL``, write the string ``"<NULL>"``.
Return ``0`` on success or ``-1`` on failure; the
appropriate exception will be set.
..c:function::intPyFile_WriteString(const char *s, PyObject *p)
Expand Down
8 changes: 8 additions & 0 deletionsDoc/c-api/object.rst
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -319,6 +319,8 @@ Object Protocol
representation on success, ``NULL`` on failure. This is the equivalent of the
Python expression ``repr(o)``. Called by the:func:`repr` built-in function.
If argument is ``NULL``, return the string ``'<NULL>'``.
..versionchanged::3.4
This function now includes a debug assertion to help ensure that it
does not silently discard an active exception.
Expand All@@ -333,6 +335,8 @@ Object Protocol
a string similar to that returned by:c:func:`PyObject_Repr` in Python 2.
Called by the:func:`ascii` built-in function.
If argument is ``NULL``, return the string ``'<NULL>'``.
..index::string; PyObject_Str (C function)
Expand All@@ -343,6 +347,8 @@ Object Protocol
Python expression ``str(o)``. Called by the:func:`str` built-in function
and, therefore, by the:func:`print` function.
If argument is ``NULL``, return the string ``'<NULL>'``.
..versionchanged::3.4
This function now includes a debug assertion to help ensure that it
does not silently discard an active exception.
Expand All@@ -358,6 +364,8 @@ Object Protocol
a TypeError is raised when *o* is an integer instead of a zero-initialized
bytes object.
If argument is ``NULL``, return the:class:`bytes` object ``b'<NULL>'``.
..c:function::intPyObject_IsSubclass(PyObject *derived, PyObject *cls)
Expand Down
2 changes: 2 additions & 0 deletionsDoc/c-api/unicode.rst
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1874,6 +1874,8 @@ object.

Call :c:func:`PyObject_Repr` on *obj* and write the output into *writer*.

*obj* should not be ``NULL``.

On success, return ``0``.
On error, set an exception, leave the writer unchanged, and return ``-1``.

Expand Down
8 changes: 8 additions & 0 deletionsInclude/cpython/unicodeobject.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -497,6 +497,14 @@ PyAPI_FUNC(int) PyUnicodeWriter_WriteStr(
PyAPI_FUNC(int) PyUnicodeWriter_WriteRepr(
PyUnicodeWriter *writer,
PyObject *obj);

PyAPI_FUNC(int) _PyUnicodeWriter_WriteReprTrue(
PyUnicodeWriter *writer,
PyObject *obj);
#if defined(Py_BUILD_CORE) || defined(Py_BUILD_CORE_MODULE)
#define PyUnicodeWriter_WriteRepr _PyUnicodeWriter_WriteReprTrue
#endif
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

It looks like a bad hack to me. I don't think that it's needed: only tuple_repr() and list_repr() should be modified to accept NULL:#146155 (comment), other functions cannot call PyUnicodeWriter_WriteRepr() with NULL.

Copy link
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

I tried to minimize the diff. If you prefer, we can simply replacePyUnicodeWriter_WriteRepr with_PyUnicodeWriter_WriteReprTrue. This will make future backports more difficult.

We cannot be sure that this is not needed until we analyze every use ofPyUnicodeWriter_WriteRepr. This will take a time. Even if it is not needed right now, it can be needed after future backports.


PyAPI_FUNC(int) PyUnicodeWriter_WriteSubstring(
PyUnicodeWriter *writer,
PyObject *str,
Expand Down
4 changes: 4 additions & 0 deletionsLib/test/test_capi/test_list.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -350,6 +350,10 @@ def test_list_extend(self):
# CRASHES list_extend(NULL, [])
# CRASHES list_extend([], NULL)

deftest_uninitialized_list_repr(self):
lst=_testlimitedcapi.list_new(3)
self.assertEqual(repr(lst),'[<NULL>, <NULL>, <NULL>]')


if__name__=="__main__":
unittest.main()
4 changes: 4 additions & 0 deletionsLib/test/test_capi/test_tuple.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -292,6 +292,10 @@ def my_iter():
self.assertEqual(tuple(my_iter()), (TAG,*range(10)))
self.assertEqual(tuples, [])

deftest_uninitialized_tuple_repr(self):
tup=_testlimitedcapi.tuple_new(3)
self.assertEqual(repr(tup),'(<NULL>, <NULL>, <NULL>)')


if__name__=="__main__":
unittest.main()
7 changes: 7 additions & 0 deletionsLib/test/test_capi/test_unicode.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1767,6 +1767,13 @@ def test_basic(self):
self.assertEqual(writer.finish(),
"var=long value 'repr'")

def test_repr_null(self):
writer = self.create_writer(0)
writer.write_utf8(b'var=', -1)
# CRASHES writer.write_repr(NULL)
writer.write_repr_true(NULL)
self.assertEqual(writer.finish(),
"var=<NULL>")
def test_write_char(self):
writer = self.create_writer(0)
writer.write_char(0)
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
Fix :meth:`!list.__repr__` for lists containing ``NULL``\ s.
17 changes: 17 additions & 0 deletionsModules/_testcapi/unicode.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -445,6 +445,22 @@ writer_write_repr(PyObject *self_raw, PyObject *obj)
}


staticPyObject*
writer_write_repr_true(PyObject*self_raw,PyObject*obj)
{
WriterObject*self= (WriterObject*)self_raw;
if (writer_check(self)<0) {
returnNULL;
}

NULLABLE(obj);
if (_PyUnicodeWriter_WriteReprTrue(self->writer,obj)<0) {
returnNULL;
}
Py_RETURN_NONE;
}


staticPyObject*
writer_write_substring(PyObject*self_raw,PyObject*args)
{
Expand DownExpand Up@@ -534,6 +550,7 @@ static PyMethodDef writer_methods[] = {
{"write_ucs4",_PyCFunction_CAST(writer_write_ucs4),METH_VARARGS},
{"write_str",_PyCFunction_CAST(writer_write_str),METH_O},
{"write_repr",_PyCFunction_CAST(writer_write_repr),METH_O},
{"write_repr_true",_PyCFunction_CAST(writer_write_repr_true),METH_O},
{"write_substring",_PyCFunction_CAST(writer_write_substring),METH_VARARGS},
{"decodeutf8stateful",_PyCFunction_CAST(writer_decodeutf8stateful),METH_VARARGS},
{"get_pointer",_PyCFunction_CAST(writer_get_pointer),METH_VARARGS},
Expand Down
2 changes: 1 addition & 1 deletionObjects/listobject.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -595,7 +595,7 @@ list_repr_impl(PyListObject *v)
so must refetch the list size on each iteration. */
for (Py_ssize_ti=0;i<Py_SIZE(v);++i) {
/* Hold a strong reference since repr(item) can mutate the list */
item=Py_NewRef(v->ob_item[i]);
item=Py_XNewRef(v->ob_item[i]);

if (i>0) {
if (PyUnicodeWriter_WriteChar(writer,',')<0) {
Expand Down
10 changes: 10 additions & 0 deletionsObjects/unicodeobject.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13972,6 +13972,16 @@ PyUnicodeWriter_WriteStr(PyUnicodeWriter *writer, PyObject *obj)
return res;
}

#undef PyUnicodeWriter_WriteRepr

int
_PyUnicodeWriter_WriteReprTrue(PyUnicodeWriter *writer, PyObject *obj)
{
if (obj == NULL) {
return _PyUnicodeWriter_WriteASCIIString((_PyUnicodeWriter*)writer, "<NULL>", 6);
}
return PyUnicodeWriter_WriteRepr(writer, obj);
}

int
PyUnicodeWriter_WriteRepr(PyUnicodeWriter *writer, PyObject *obj)
Expand Down
Loading
[8]ページ先頭
©2009-2026 Movatter.jp