Commit8e13db1

committed

Fix cleanup of PNG structures on error.

If `info_ptr` isn't created, we should still destroy `png_ptr`.

1 parentae00468 commit8e13db1Copy full SHA for 8e13db1

File tree

-2

lines changed

-2

lines changed

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -346,8 +346,12 @@ static PyObject Py_write_png(PyObject self, PyObject args, PyObject kwds)`
`346`	`346`	`png_write_end(png_ptr, info_ptr);`
`347`	`347`
`348`	`348`	`exit:`
`349`		`-if (png_ptr && info_ptr) {`
`350`		`-png_destroy_write_struct(&png_ptr, &info_ptr);`
	`349`	`+if (png_ptr) {`
	`350`	`+if (info_ptr) {`
	`351`	`+png_destroy_write_struct(&png_ptr, &info_ptr);`
	`352`	`+ }else {`
	`353`	`+png_destroy_write_struct(&png_ptr,NULL);`
	`354`	`+ }`
`351`	`355`	`}`
`352`	`356`	`if (PyErr_Occurred()) {`
`353`	`357`	`Py_XDECREF(buff.str);`

Comments

(0)