Report error if any supplied bound/index is zero or negative

Author: dsberry

dat1.h

@@ -286,8 +286,8 @@ dat1ExportDims( int ndims, const hsize_t h5dims[], hdsdim hdsdims[],
                 int *status );
 
 void
-dat1ImportDims( int ndims, const hdsdim hdsdims[], hsize_t h5dims[],
-                int *status );
+dat1ImportDims( const char *func, int ndims, const hdsdim hdsdims[],
+                hsize_t h5dims[], int *status );
 
 char *
 dat1GetFullName( hid_t objid, int asfile, ssize_t * namlen, int *status);

dat1ImportDims.c

@@ -13,14 +13,17 @@
 *     Library routine
 
 *  Invocation:
-*     void dat1ImportDims( int ndims, const hdsdim hdsdims[], hsize_t h5dims[],
-*                          int * status );
+*     void dat1ImportDims( const char *func, int ndims, const hdsdim hdsdims[],
+*                          hsize_t h5dims[], int * status );
 
 *  Arguments:
+*     func = const char * (Given)
+*        The name of the calling function, for use in error messages.
 *     ndims = int (Given)
 *        Number of dimensions to import.
 *     hdsdims = const hdsdim[] (Given)
-*        Dimensions to import. Only ndims will be accessed.
+*        Dimensions to import. Only ndims will be accessed. These are
+*        1-based indices.
 *     h5dims = hsize_t [] (Returned)
 *        Array to receive imported dimensions. Must be at least ndims in size.
 *     status = int* (Given and Returned)
@@ -32,7 +35,8 @@
 
 *  Authors:
 *     TIMJ: Tim Jenness (Cornell)
-*     {enter_new_authors_here}
+*     DSB: David S Berry (EAO)
+    {enter_new_authors_here}
 
 *  Notes:
 *     - Does not assume that hdsdim and hsize_t are the same type.
@@ -42,6 +46,8 @@
 *  History:
 *     2014-09-03 (TIMJ):
 *        Initial version
+*     2019-02-14 (DSB):
+*        Report error if any supplied index is less than or equal to zero.
 *     {enter_further_changes_here}
 
 *  Copyright:
@@ -92,20 +98,29 @@
 
 #include "hds1.h"
 #include "dat1.h"
+#include "dat_err.h"
 #include "hds.h"
 
 void
-dat1ImportDims( int ndims, const hdsdim hdsdims[], hsize_t h5dims[],
-                int *status ) {
+dat1ImportDims( const char *func, int ndims, const hdsdim hdsdims[],
+                hsize_t h5dims[], int *status ) {
   int i;
 
   if (*status != SAI__OK) return;
   if (ndims == 0) return;
 
   /* We have to transpose these dimensions */
   for (i=0; i<ndims; i++) {
-    int oposn = ndims - 1 - i;
-    h5dims[oposn] = hdsdims[i];
+     if( hdsdims[ i ] <= 0 ) {
+        *status = DAT__SUBIN;
+        emsRepf( " ", "%s: Illegal subscript (%" HDS_DIM_FORMAT
+                 ") for dimension %d", status, func, hdsdims[ i ],
+                 i );
+        break;
+     } else {
+        int oposn = ndims - 1 - i;
+       h5dims[oposn] = hdsdims[i];
+     }
   }
   return;
 }

dat1New.c

@@ -151,7 +151,7 @@ dat1New( const HDSLoc    *locator,
   if (*status != SAI__OK) return NULL;
 
   /* Copy dimensions if appropriate */
-  dat1ImportDims( ndim, dims, h5dims, status );
+  dat1ImportDims( "dat1New", ndim, dims, h5dims, status );
 
   /* Work out where to place the component */
   place = dat1RetrieveContainer( locator, status );

datAlter.c

@@ -247,7 +247,7 @@ datAlter( HDSLoc *locator, int ndim, const hdsdim dims[], int *status) {
     herr_t h5err;
 
     /* Copy dimensions and reorder */
-    dat1ImportDims( ndim, dims, h5dims, status );
+    dat1ImportDims( "datAlter", ndim, dims, h5dims, status );
 
     /* First we simply try the native resize. This will only work
        if the system is using chunked storage and the registered

datCell.c

@@ -119,7 +119,7 @@ datCell(const HDSLoc *locator1, int ndim, const hdsdim subs[],
   datName(locator1, namestr, status );
 
   /* Copy dimensions if appropriate */
-  dat1ImportDims( ndim, subs, h5subs, status );
+  dat1ImportDims( "datCell", ndim, subs, h5subs, status );
 
   isstruct = dat1IsStructure( locator1, status );
 

datGet.c

@@ -235,7 +235,7 @@ datGet(const HDSLoc *locator, const char *type_str, int ndim,
   }
 
   /* Copy dimensions if appropriate */
-  dat1ImportDims( ndim, dims, h5dims, status );
+  dat1ImportDims( "datGet", ndim, dims, h5dims, status );
 
   /* Create a memory dataspace for the incoming data */
   CALLHDFE( hid_t, mem_dataspace_id,

datPut.c

@@ -244,7 +244,7 @@ datPut( const HDSLoc *locator, const char *type_str, int ndim, const hdsdim dims
   }
 
   /* Copy dimensions if appropriate */
-  dat1ImportDims( ndim, dims, h5dims, status );
+  dat1ImportDims( "datPut", ndim, dims, h5dims, status );
 
   /* Create a memory dataspace for the incoming data */
   CALLHDFE( hid_t, mem_dataspace_id,

datSlice.c

@@ -207,9 +207,9 @@ datSlice(const HDSLoc *locator1, int ndim, const hdsdim lower[],
   }
 
   /* Import the bounds. */
-  dat1ImportDims( ndim, loc2lower, h5lower, status );
-  dat1ImportDims( ndim, loc2upper, h5upper, status );
-  dat1ImportDims( ndim, loc1dims, h5dims, status );
+  dat1ImportDims( "datSlice (lower)", ndim, loc2lower, h5lower, status );
+  dat1ImportDims( "datSlice (upper)", ndim, loc2upper, h5upper, status );
+  dat1ImportDims( "datSlice", ndim, loc1dims, h5dims, status );
 
   /* Clone the locator and modify its dataspace */
   datClone( locator1, &sliceloc, status );

hdsNew.c

@@ -149,7 +149,7 @@ hdsNew(const char *file_str,
   if (*status != SAI__OK) return *status;
 
   /* Copy dimensions if appropriate */
-  dat1ImportDims( ndim, dims, h5dims, status );
+  dat1ImportDims( "hdsNew", ndim, dims, h5dims, status );
 
   /* Convert the HDS data type to HDF5 data type as an early sanity
      check. */