Fix error reporting in png extension.

mdboom · mdboom · commit 6a735e2d8ba5 · 2011-08-25T13:31:59.000-04:00
diff --git a/src/_png.cpp b/src/_png.cpp
@@ -262,7 +262,11 @@ Py::Object _png_module::write_png(const Py::Tuple& args)
         fclose(fp);
     }
 
-    return Py::Object();
+    if (PyErr_Occurred()) {
+        throw Py::Exception();
+    } else {
+        return Py::Object();
+    }
 }
 
 static void _read_png_data(PyObject* py_file_obj, png_bytep data, png_size_t length)
@@ -551,7 +555,12 @@ _png_module::_read_png(const Py::Object& py_fileobj, const bool float_result)
     }
     delete [] row_pointers;
 
-    return (PyObject*)A;
+    if (PyErr_Occurred()) {
+        Py_DECREF((PyObject *)A);
+        return NULL;
+    } else {
+        return (PyObject *)A;
+    }
 }
 
 Py::Object

Original file line number	Diff line number	Diff line change
`@@ -262,7 +262,11 @@ Py::Object _png_module::write_png(const Py::Tuple& args)`
`262`	`262`	`fclose(fp);`
`263`	`263`	`}`
`264`	`264`
`265`		`- return Py::Object();`
	`265`	`+ if (PyErr_Occurred()) {`
	`266`	`+ throw Py::Exception();`
	`267`	`+ } else {`
	`268`	`+ return Py::Object();`
	`269`	`+ }`
`266`	`270`	`}`
`267`	`271`
`268`	`272`	`static void _read_png_data(PyObject* py_file_obj, png_bytep data, png_size_t length)`
`@@ -551,7 +555,12 @@ _png_module::_read_png(const Py::Object& py_fileobj, const bool float_result)`
`551`	`555`	`}`
`552`	`556`	`delete [] row_pointers;`
`553`	`557`
`554`		`- return (PyObject*)A;`
	`558`	`+ if (PyErr_Occurred()) {`
	`559`	`+ Py_DECREF((PyObject *)A);`
	`560`	`+ return NULL;`
	`561`	`+ } else {`
	`562`	`+ return (PyObject *)A;`
	`563`	`+ }`
`555`	`564`	`}`
`556`	`565`
`557`	`566`	`Py::Object`