correct / enhance istart,iend bounds checks

fixes #54

Author: scivision

src/utils.f90

@@ -311,7 +311,7 @@
   write(stderr,*) "ERROR:h5fortran:get_slice: memory size /= dataset size: check variable slice (index). " // &
     " Dset_dims:", ddims, "C Mem_dims:", c_mem_dims, "mem_dims:", mem_dims, "rank(mem_dims):", rank(mem_dims)
   error stop "ERROR:h5fortran:get_slice " // dset_name
-elseif(any(iend-1 > ddims)) then
+elseif(any(iend-istart+1 > ddims)) then
   write(stderr,*) "ERROR:h5fortran:get_slice: iend: ", iend, ' > dset_dims: ', ddims
   error stop "ERROR:h5fortran:get_slice " // dset_name
 endif

src/write.f90

@@ -58,6 +58,7 @@
 integer :: ier, drank, i
 integer(HID_T) :: dcpl
 integer(HSIZE_T), dimension(:), allocatable :: ddims, maxdims
+character(:), allocatable :: emsg
 
 
 call H5Tcopy_f(dtype, dtype_id, ier)
@@ -80,19 +81,42 @@
   call estop(ier, "create:H5Dget_space", self%filename, dname)
 
 
-  if (present(istart)) then
-    if(any(istart < 1)) error stop 'ERROR:h5fortran:create: istart must be >= 1'
-    if(any(iend <= istart)) error stop 'ERROR:h5fortran:create: iend must be > istart'
-
+  if (present(istart) .and. present(iend)) then
     call H5Sget_simple_extent_ndims_f(filespace_id, drank, ier)
     call estop(ier, "create:H5Sget_simple_extent_ndims", self%filename, dname)
 
+    if (size(istart) /= drank) then
+      write(stderr,*) "ERROR:h5fortran:create: " // dname // " istart ", istart, " length ", size(istart), " /= rank ", drank
+      error stop
+    endif
+    if (size(iend) /= drank) then
+      write(stderr,*) "ERROR:h5fortran:create: " // dname // " iend ", iend, " length ", size(iend), " /= rank ", drank
+      error stop
+    endif
+    if(any(istart < 1)) error stop 'ERROR:h5fortran:create: ' // dname // ' istart must be >= 1'
+    do i = 1, drank
+      if(iend(i) < istart(i)) emsg = 'ERROR:h5fortran:create: ' // dname // ' iend must be > istart'
+    enddo
+    if (allocated(emsg)) then
+      write(stderr,*) emsg // " dataset: " // dname // " file: " // self%filename // " istart: ", &
+        istart, " iend: ", iend
+      error stop
+    endif
+
     allocate(ddims(drank), maxdims(drank))
 
     call H5Sget_simple_extent_dims_f(filespace_id, ddims, maxdims, ier)
     if (ier /= drank) error stop 'ERROR:h5fortran:create: H5Sget_simple_extent_dims: ' // dname // ' in ' // self%filename
 
-    if(any(iend > ddims)) error stop 'ERROR:h5fortran:create: iend > dset_dims'  // dname // ' in ' // self%filename
+    do i = 1, drank
+      if (iend(i) - istart(i) > ddims(i)) emsg = 'ERROR:h5fortran:create: iend - istart > dset_dims'
+    enddo
+    if (allocated(emsg)) then
+      write(stderr,*) emsg // " dataset: " // dname // " file: " // self%filename // " istart: ", &
+        istart, " iend: ", iend, " ddims: ", ddims, " maxdims: ", maxdims
+      error stop
+    endif
+
   else
     if (size(mem_dims) == 0) then
       !! scalar

test/test_array.f90

@@ -58,6 +58,9 @@ subroutine test_basic_array(filename)
 call h%write('/sub-int32-2d', i2_8(3:6, 4:7))
 print '(4i3)', i2_8(3:6, 4:7)
 
+call h % write('/endstart', i2t)
+call h % write('/endstart', reshape([5], [1, 1]), istart=[3,2], iend=[3,2])
+
 call h%close()
 
 !! read
@@ -95,6 +98,12 @@ subroutine test_basic_array(filename)
 call h%read('real32-2d', B(2:5,3:6))
 if(.not.all(B(2:5,3:6) == r2)) error stop 'real 2D: reading into variable slice'
 
+call h % read('/endstart', i2t(1:1,1:1), istart=[3,2], iend=[3,2])
+if (i2t(1,1) /= 5) then
+  write(stderr, '(a,i3)') 'read endstart does not match write: expected 5 but got ', i2t(1,1)
+  error stop 'ERROR: read endstart fail'
+endif
+
 call h%close()
 
 end subroutine test_basic_array