GH-90699: fix ref counting of static immortal strings (gh-94850)

miss-islington · kumaraditya303 · web-flow · commit 84d58ad17bae · 2022-07-19T23:56:47.000-07:00
(cherry picked from commit 1834133) Co-authored-by: Kumar Aditya <59607654+kumaraditya303@users.noreply.github.com>
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-14-10-07-53.gh-issue-90699.x3aG9m.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-14-10-07-53.gh-issue-90699.x3aG9m.rst
@@ -0,0 +1 @@
+Fix reference counting bug in :meth:`bool.__repr__`. Patch by Kumar Aditya.
diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c
@@ -2244,7 +2244,7 @@ _textiowrapper_readline(textio *self, Py_ssize_t limit)
         Py_CLEAR(chunks);
     }
     if (line == NULL) {
-        line = &_Py_STR(empty);
+        line = Py_NewRef(&_Py_STR(empty));
     }
 
     return line;
diff --git a/Objects/boolobject.c b/Objects/boolobject.c
@@ -9,7 +9,8 @@
 static PyObject *
 bool_repr(PyObject *self)
 {
-    return self == Py_True ? &_Py_ID(True) : &_Py_ID(False);
+    PyObject *res = self == Py_True ? &_Py_ID(True) : &_Py_ID(False);
+    return Py_NewRef(res);
 }
 
 /* Function to return a bool from a C long */

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Fix reference counting bug in :meth:`bool.__repr__`. Patch by Kumar Aditya.
Original file line number	Diff line number	Diff line change
`@@ -2244,7 +2244,7 @@ _textiowrapper_readline(textio *self, Py_ssize_t limit)`
`2244`	`2244`	`Py_CLEAR(chunks);`
`2245`	`2245`	`}`
`2246`	`2246`	`if (line == NULL) {`
`2247`		`- line = &_Py_STR(empty);`
	`2247`	`+ line = Py_NewRef(&_Py_STR(empty));`
`2248`	`2248`	`}`
`2249`	`2249`
`2250`	`2250`	`return line;`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,8 @@`
`9`	`9`	`static PyObject *`
`10`	`10`	`bool_repr(PyObject *self)`
`11`	`11`	`{`
`12`		`- return self == Py_True ? &_Py_ID(True) : &_Py_ID(False);`
	`12`	`+ PyObject *res = self == Py_True ? &_Py_ID(True) : &_Py_ID(False);`
	`13`	`+ return Py_NewRef(res);`
`13`	`14`	`}`
`14`	`15`
`15`	`16`	`/* Function to return a bool from a C long */`