Merge pull request #436 from mdboom/png_error_reporting

mdboom · mdboom · commit 773a7e6dc633 · 2011-08-29T12:52:05.000-07:00
Fix error reporting in png extension.
diff --git a/src/_png.cpp b/src/_png.cpp
@@ -234,7 +234,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)
@@ -475,7 +479,13 @@ _png_module::read_png(const Py::Tuple& args)
         delete [] row_pointers[row];
     }
     delete [] row_pointers;
-    return Py::asObject((PyObject*)A);
+
+    if (PyErr_Occurred()) {
+        Py_DECREF((PyObject *)A);
+        throw Py::Exception();
+    } else {
+        return Py::asObject((PyObject*)A);
+    }
 }
 
 extern "C"

Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,11 @@ Py::Object _png_module::write_png(const Py::Tuple& args)`
`234`	`234`	`fclose(fp);`
`235`	`235`	`}`
`236`	`236`
`237`		`- return Py::Object();`
	`237`	`+ if (PyErr_Occurred()) {`
	`238`	`+ throw Py::Exception();`
	`239`	`+ } else {`
	`240`	`+ return Py::Object();`
	`241`	`+ }`
`238`	`242`	`}`
`239`	`243`
`240`	`244`	`static void _read_png_data(PyObject* py_file_obj, png_bytep data, png_size_t length)`
`@@ -475,7 +479,13 @@ _png_module::read_png(const Py::Tuple& args)`
`475`	`479`	`delete [] row_pointers[row];`
`476`	`480`	`}`
`477`	`481`	`delete [] row_pointers;`
`478`		`- return Py::asObject((PyObject*)A);`
	`482`	`+`
	`483`	`+ if (PyErr_Occurred()) {`
	`484`	`+ Py_DECREF((PyObject *)A);`
	`485`	`+ throw Py::Exception();`
	`486`	`+ } else {`
	`487`	`+ return Py::asObject((PyObject*)A);`
	`488`	`+ }`
`479`	`489`	`}`
`480`	`490`
`481`	`491`	`extern "C"`