mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-01-18 15:15:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r180] Seperated range checking of start, count & stride in H5Pset_hyperslab from

Browse Source 
building hyperslab arrays so earlier hyperslab don't get blown away if the new
one is incorrect.  Fixed fence-post error in range checking also.
This commit is contained in:
Quincey Koziol 1998-01-28 07:35:04 -05:00
parent 67bfd03657
commit faab4bbf1b
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/H5P.c
View File

@ -1007,23 +1007,28 @@ H5Pset_hyperslab(hid_t sid, const size_t *start, const size_t *count, const size
/* Set up stride values for later use */
tmp_stride= H5MM_xmalloc(space->u.simple.rank*sizeof(size_t));
for (u=0; u<space->u.simple.rank; u++) {
tmp_stride[u] = stride ? stride[u] : 1;
tmp_stride[u] = stride ? stride[u] : 1;
}
/* Range check arguments */
for(u=0; u<space->u.simple.rank; u++)
{
if(start[u]<0 || start[u]>=space->u.simple.size[u])
HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL,"hyperslab bounds out of range");
if(start[u]+(SIGN(count[u])*(ABS(count[u])-1)*tmp_stride[u])<0 || start[u]+(SIGN(count[u])*(ABS(count[u])-1)*tmp_stride[u])>=space->u.simple.size[u])
HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL,"hyperslab bounds out of range");
} /* end for */
/* Allocate space for the hyperslab information */
if (NULL==space->h.start) {
space->h.start= H5MM_xcalloc(space->u.simple.rank,sizeof(size_t));
space->h.count= H5MM_xcalloc(space->u.simple.rank,sizeof(size_t));
space->h.stride= H5MM_xcalloc(space->u.simple.rank,sizeof(size_t));
space->h.start= H5MM_xcalloc(space->u.simple.rank,sizeof(size_t));
space->h.count= H5MM_xcalloc(space->u.simple.rank,sizeof(size_t));
space->h.stride= H5MM_xcalloc(space->u.simple.rank,sizeof(size_t));
}
/* Build hyperslab */
for(u=0; u<space->u.simple.rank; u++)
{
/* Range checking arguments */
if(start[u]+(count[u]*tmp_stride[u])<=0 || start[u]+(count[u]*tmp_stride[u])>=space->u.simple.size[u])
HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL,"hyperslab bounds out of range");
/* copy "normalized" (i.e. strictly increasing) values for hyperslab parameters */
space->h.start[u]=MIN(start[u],start[u]+((ABS(count[u])-1)*tmp_stride[u]));
space->h.count[u]=ABS(count[u]);
@ -1033,11 +1038,7 @@ H5Pset_hyperslab(hid_t sid, const size_t *start, const size_t *count, const size
done:
if (ret_value == FAIL) { /* Error condition cleanup */
/* Free hyperslab arrays if we encounter an error */
H5MM_xfree(space->h.start);
H5MM_xfree(space->h.count);
H5MM_xfree(space->h.stride);
space->hslab_def = FALSE;
} /* end if */
/* Normal function cleanup */