bpo-46881: Fix refleak from GH-31616 (GH-31805)

JelleZijlstra · web-flow · commit 54ab9ad312ea · 2022-03-11T17:05:08.000+08:00
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
@@ -677,10 +677,12 @@ unicode_result_ready(PyObject *unicode)
         if (kind == PyUnicode_1BYTE_KIND) {
             const Py_UCS1 *data = PyUnicode_1BYTE_DATA(unicode);
             Py_UCS1 ch = data[0];
-            if (unicode != LATIN1(ch)) {
+            PyObject *latin1_char = LATIN1(ch);
+            if (unicode != latin1_char) {
+                Py_INCREF(latin1_char);
                 Py_DECREF(unicode);
             }
-            return get_latin1_char(ch);
+            return latin1_char;
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -677,10 +677,12 @@ unicode_result_ready(PyObject *unicode)`
`677`	`677`	`if (kind == PyUnicode_1BYTE_KIND) {`
`678`	`678`	`const Py_UCS1 *data = PyUnicode_1BYTE_DATA(unicode);`
`679`	`679`	`Py_UCS1 ch = data[0];`
`680`		`- if (unicode != LATIN1(ch)) {`
	`680`	`+ PyObject *latin1_char = LATIN1(ch);`
	`681`	`+ if (unicode != latin1_char) {`
	`682`	`+ Py_INCREF(latin1_char);`
`681`	`683`	`Py_DECREF(unicode);`
`682`	`684`	`}`
`683`		`- return get_latin1_char(ch);`
	`685`	`+ return latin1_char;`
`684`	`686`	`}`
`685`	`687`	`}`
`686`	`688`