Changeset 5474

Timestamp:

Jul 7, 2008, 4:03:14 PM (15 years ago)

Author:

ole

Message:

'added check to ensure that permutation indices are not out of bounds'

Location:

anuga_core/source/anuga/shallow_water

Files:

• data_manager.py (modified) (1 diff)
• urs_ext.c (modified) (1 diff)

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -5061 +5061 @@
         reference_header_split = reference_header.split(',')
         for i in range(3):
-            if not file_header[i] == reference_header_split[i]:
+            if not file_header[i].strip() == reference_header_split[i].strip():
                 msg = 'File must contain header: '+reference_header+'\n'
                 raise Exception, msg

anuga_core/source/anuga/shallow_water/urs_ext.c

@@ -197 +197 @@
      // Specifies the gauge numbers that for which data is to be extracted
      permutation_array=(PyArrayObject *) PyArray_ContiguousFromObject(permutation,PyArray_INT,1,1);
+     N = permutation_array->dimensions[0]; //FIXME: this is overwritten below
+     for (ista=0; ista<N; ista++){
+       if ((int)*(long *) (permutation_array -> data+ista*permutation_array->strides[0])>=nsta0){
+         printf("Maximum index = %d, you had %d\n",nsta0-1,(int)*(long *) (permutation_array -> data+ista*permutation_array->strides[0]));
+         PyErr_SetString(PyExc_RuntimeError,"The permutation specified is out of bounds");
+         return NULL;
+       }
+     }
    }
    if(permutation_array == NULL){
-     PyErr_SetString(PyExc_RuntimeError,"ERROR: Memory for permutation_array array could not be allocated");
+     PyErr_SetString(PyExc_RuntimeError,"Memory for permutation_array array could not be allocated");
      return NULL;
    }