Changeset 2846

Timestamp:

May 11, 2006, 3:15:56 PM (18 years ago)

Author:

jack

Message:

Plugged a memory leak and improved graceful exits on errors.

File:

• inundation/pymetis/pymetis/metis.c (modified) (5 diffs)

inundation/pymetis/pymetis/metis.c

@@ -43 +43 @@
 static PyObject * metis_partMeshNodal(PyObject * self, PyObject * args){
   int i;
+  int malloc_elem_c_arr = 0;
   int ne;
   int nn;
@@ -73 +74 @@
   if(elem_arr->descr->type_num == PyArray_LONG){
     elem_c_arr = (idxtype *)malloc(*(elem_arr->dimensions) * sizeof(idxtype));
+    malloc_elem_c_arr;
     if(!elem_c_arr)
         return NULL;
     for(i = 0 ; i < *(elem_arr->dimensions) ; i++){
       elem_c_arr[i] = (idxtype)(((long *)elem_arr->data)[i]);
-      if(elem_c_arr[i] != ((long *)elem_arr->data)[i]) /* i.e. downcast failed */
-        return null;
+      if(elem_c_arr[i] != ((long *)elem_arr->data)[i]){ /* i.e. downcast failed */
+        free(elem_c_arr);
+        Py_DECREF(elem_arr);
+        return NULL;
     }
   }else
@@ -85 +89 @@
   epart = (idxtype *)malloc(ne * sizeof(idxtype));
   if(epart == NULL){
+    if(malloc_elem_c_arr) free(elem_c_arr);
     Py_DECREF(elem_arr);
     return NULL;
@@ -90 +95 @@
   npart = (idxtype *)malloc(nn * sizeof(idxtype));
   if(npart == NULL){
+    if(malloc_elem_c_arr) free(elem_c_arr);
     free(epart);
     Py_DECREF(elem_arr);
@@ -101 +107 @@
   npart_pyarr = (PyArrayObject *)PyArray_FromDimsAndData(1, dims, PyArray_INT, (char *)npart);
 
+  
+  if(malloc_elem_c_arr) free(elem_c_arr);
   Py_DECREF(elem_arr);