PyUnicode_FromEncodedObject(): Repair memory leak in an error case.

tim-one · tim-one · commit 0ebeb584a496 · 2001-09-11T02:00:50.000Z
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
@@ -424,13 +424,13 @@ PyObject *PyUnicode_FromEncodedObject(register PyObject *obj,
 	owned = 1;
     }
     if (PyUnicode_Check(obj)) {
-	Py_INCREF(obj);
-	v = obj;
 	if (encoding) {
 	    PyErr_SetString(PyExc_TypeError,
 			    "decoding Unicode is not supported");
 	    return NULL;
 	}
+	Py_INCREF(obj);
+	v = obj;
 	goto done;
     }
     else if (PyString_Check(obj)) {

Original file line number	Diff line number	Diff line change
`@@ -424,13 +424,13 @@ PyObject PyUnicode_FromEncodedObject(register PyObject obj,`
`424`	`424`	`owned = 1;`
`425`	`425`	`}`
`426`	`426`	`if (PyUnicode_Check(obj)) {`
`427`		`- Py_INCREF(obj);`
`428`		`- v = obj;`
`429`	`427`	`if (encoding) {`
`430`	`428`	`PyErr_SetString(PyExc_TypeError,`
`431`	`429`	`"decoding Unicode is not supported");`
`432`	`430`	`return NULL;`
`433`	`431`	`}`
	`432`	`+ Py_INCREF(obj);`
	`433`	`+ v = obj;`
`434`	`434`	`goto done;`
`435`	`435`	`}`
`436`	`436`	`else if (PyString_Check(obj)) {`