Commit 3be3776

NoahStappblink1073

authored and

committed

PYTHON-5571 - Fix memory leak when raising InvalidDocument with C extensions (mongodb#2573)

(cherry picked from commit 52400e1)

1 parent 23abc9f commit 3be3776Copy full SHA for 3be3776

File tree

-3

lines changed

-3

lines changed

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1657,26 +1657,28 @@ void handle_invalid_doc_error(PyObject* dict) {`
`1657`	`1657`	`}`
`1658`	`1658`
`1659`	`1659`	`if (evalue && PyErr_GivenExceptionMatches(etype, InvalidDocument)) {`
`1660`		`- PyObject*msg = PyObject_Str(evalue);`
	`1660`	`+ msg = PyObject_Str(evalue);`
`1661`	`1661`	`if (msg) {`
`1662`	`1662`	`const char * msg_utf8 = PyUnicode_AsUTF8(msg);`
`1663`	`1663`	`if (msg_utf8 == NULL) {`
`1664`	`1664`	`goto cleanup;`
`1665`	`1665`	`}`
`1666`		`- PyObject*new_msg = PyUnicode_FromFormat("Invalid document: %s", msg_utf8);`
	`1666`	`+ new_msg = PyUnicode_FromFormat("Invalid document: %s", msg_utf8);`
`1667`	`1667`	`if (new_msg == NULL) {`
`1668`	`1668`	`goto cleanup;`
`1669`	`1669`	`}`
`1670`	`1670`	`// Add doc to the error instance as a property.`
`1671`		`- PyObject*new_evalue = PyObject_CallFunctionObjArgs(InvalidDocument, new_msg, dict, NULL);`
	`1671`	`+ new_evalue = PyObject_CallFunctionObjArgs(InvalidDocument, new_msg, dict, NULL);`
`1672`	`1672`	`Py_DECREF(evalue);`
`1673`	`1673`	`Py_DECREF(etype);`
`1674`	`1674`	`etype = InvalidDocument;`
`1675`	`1675`	`InvalidDocument = NULL;`
`1676`	`1676`	`if (new_evalue) {`
`1677`	`1677`	`evalue = new_evalue;`
	`1678`	`+ new_evalue = NULL;`
`1678`	`1679`	`} else {`
`1679`	`1680`	`evalue = msg;`
	`1681`	`+ msg = NULL;`
`1680`	`1682`	`}`
`1681`	`1683`	`}`
`1682`	`1684`	`PyErr_NormalizeException(&etype, &evalue, &etrace);`

Comments

(0)