Check for index validity in GSkyMap::__getitem__() method (#1581).

This is needed for correct catching of exceptions by the SWIG interface on some operating systems.

Check for index validity in GSkyMap::getitem() method (#1581).
This is needed for correct catching of exceptions by the SWIG interface on some operating systems.
Jürgen Knödlseder
1 parent a9ec30d3
Showing 2 changed files with 28 additions and 2 deletions
pyext/GSkyMap.i
test/test_GSky.py
@@ -183,11 +183,21 @@ public:
  ***************************************************************************/
 %extend GSkyMap {
     double __getitem__(int GSkyMapInx[]) {
+        if (GSkyMapInx[1] < 0 || GSkyMapInx[1] >= self->npix()) {
+            throw GException::out_of_range("__getitem__(int)", "Sky map index",
+                                           GSkyMapInx[1], self->npix());
+        }
         if (GSkyMapInx[0] == 1) {
             return (*self)(GSkyMapInx[1]);
         }
         else {
-            return (*self)(GSkyMapInx[1], GSkyMapInx[2]);
+            if (GSkyMapInx[2] >= 0 && GSkyMapInx[2] < self->nmaps()) {
+                return (*self)(GSkyMapInx[1], GSkyMapInx[2]);
+            }
+            else {
+                throw GException::out_of_range("__getitem__(int)", "Sky map number",
+                                               GSkyMapInx[2], self->nmaps());
+            }
         }
     }
     /*
@@ -196,11 +206,21 @@ public:
     }
     */
     void __setitem__(int GSkyMapInx[], double value) {
+        if (GSkyMapInx[1] < 0 || GSkyMapInx[1] >= self->npix()) {
+            throw GException::out_of_range("__setitem__(int)", "Sky map index",
+                                           GSkyMapInx[1], self->npix());
+        }
         if (GSkyMapInx[0] == 1) {
             (*self)(GSkyMapInx[1]) = value;
         }
         else {
-            (*self)(GSkyMapInx[1], GSkyMapInx[2]) = value;
+            if (GSkyMapInx[2] >= 0 && GSkyMapInx[2] < self->nmaps()) {
+                (*self)(GSkyMapInx[1], GSkyMapInx[2]) = value;
+            }
+            else {
+                throw GException::out_of_range("__setitem__(int)", "Sky map number",
+                                               GSkyMapInx[2], self->nmaps());
+            }
         }
     }
     /*
@@ -370,6 +370,12 @@ class Test(gammalib.GPythonTestSuite):
         self.test_value(map[1], 3.0)
         self.test_value(map[2], 5.0)
         self.test_value(map[3], 7.0)
+
+        # Access operator (tests also proper iteration)
+        sum = 0.0
+        for pix in map:
+            sum += pix
+        self.test_value(sum, 16.0)        
  
         # Return
         return