Fix out-of-memory errors leading to segfaults

mdboom · mdboom · commit f830e37891aa · 2009-07-01T19:55:17.000Z
svn path=/branches/v0_98_5_maint/; revision=7245
diff --git a/src/_path.cpp b/src/_path.cpp
@@ -882,6 +882,9 @@ Py::Object _path_module::clip_path_to_rect(const Py::Tuple &args)
             size_t size = p->size();
             dims[0] = p->size();
             PyArrayObject* pyarray = (PyArrayObject*)PyArray_SimpleNew(2, dims, PyArray_DOUBLE);
+            if (pyarray == NULL) {
+                throw Py::MemoryError("Could not allocate result array");
+            }
             for (size_t i = 0; i < size; ++i)
             {
                 ((double *)pyarray->data)[2*i]	 = (*p)[i].x;
@@ -951,6 +954,9 @@ Py::Object _path_module::affine_transform(const Py::Tuple& args)
 
         result = (PyArrayObject*)PyArray_SimpleNew
           (PyArray_NDIM(vertices), PyArray_DIMS(vertices), PyArray_DOUBLE);
+        if (result == NULL) {
+            throw Py::MemoryError("Could not allocate memory for path");
+        }
         if (PyArray_NDIM(vertices) == 2)
         {
             size_t n = PyArray_DIM(vertices, 0);
diff --git a/src/_png.cpp b/src/_png.cpp
@@ -266,6 +266,10 @@ _png_module::read_png(const Py::Tuple& args) {
   double max_value = (1 << ((bit_depth < 8) ? 8 : bit_depth)) - 1;
   PyArrayObject *A = (PyArrayObject *) PyArray_SimpleNew(num_dims, dimensions, PyArray_FLOAT);
 
+  if (A == NULL) {
+    throw Py::MemoryError("Could not allocate image array");
+  }
+
   for (png_uint_32 y = 0; y < height; y++) {
     png_byte* row = row_pointers[y];
 	for (png_uint_32 x = 0; x < width; x++) {
