summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2003-12-10 18:34:53 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2003-12-10 18:34:53 (GMT)
commitf473fc5cb8a6e100141088568533e9973ad5d95e (patch)
tree41be442740674a3323244614f46fb5b77c77984b
parent404567ce6466d3cf04743f2dc1cdf15568b01a5d (diff)
downloadhdf5-f473fc5cb8a6e100141088568533e9973ad5d95e.zip
hdf5-f473fc5cb8a6e100141088568533e9973ad5d95e.tar.gz
hdf5-f473fc5cb8a6e100141088568533e9973ad5d95e.tar.bz2
[svn-r7926] Purpose:
Bug fix Description: Clean up a few allocations of zero-sized blocks that were detected with the new free-list assertions. Platforms tested: FreeBSD 4.9 (sleipnir) w & w/o parallel too minor to require h5committest
-rw-r--r--src/H5S.c18
-rw-r--r--src/H5Sselect.c27
2 files changed, 32 insertions, 13 deletions
diff --git a/src/H5S.c b/src/H5S.c
index 60af326..f599213 100644
--- a/src/H5S.c
+++ b/src/H5S.c
@@ -1200,8 +1200,12 @@ H5S_read(H5G_entry_t *ent, hid_t dxpl_id)
HGOTO_ERROR (H5E_DATASPACE, H5E_CANTSET, NULL, "unable to set all selection");
/* Allocate space for the offset and set it to zeros */
- if (NULL==(ds->select.offset = H5FL_ARR_CALLOC(hssize_t,ds->extent.u.simple.rank)))
- HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed");
+ if(ds->extent.u.simple.rank>0) {
+ if (NULL==(ds->select.offset = H5FL_ARR_CALLOC(hssize_t,ds->extent.u.simple.rank)))
+ HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed");
+ } /* end if */
+ else
+ ds->select.offset = NULL;
/* Set the value for successful return */
ret_value=ds;
@@ -1380,8 +1384,12 @@ H5S_set_extent_simple (H5S_t *space, unsigned rank, const hsize_t *dims,
space->select.offset=H5FL_ARR_FREE(hssize_t,space->select.offset);
/* Allocate space for the offset and set it to zeros */
- if (NULL==(space->select.offset = H5FL_ARR_CALLOC(hssize_t,rank)))
- HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed");
+ if(rank>0) {
+ if (NULL==(space->select.offset = H5FL_ARR_CALLOC(hssize_t,rank)))
+ HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed");
+ } /* end if */
+ else
+ space->select.offset = NULL;
/* shift out of the previous state to a "simple" dataspace */
switch (space->extent.type) {
@@ -1917,6 +1925,8 @@ H5Soffset_simple(hid_t space_id, const hssize_t *offset)
/* Check args */
if (NULL == (space = H5I_object_verify(space_id, H5I_DATASPACE)))
HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "not a data space");
+ if (space->extent.u.simple.rank==0 || space->extent.type==H5S_SCALAR)
+ HGOTO_ERROR(H5E_ATOM, H5E_UNSUPPORTED, FAIL, "can't set offset on scalar dataspace");
if (offset == NULL)
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no offset specified");
diff --git a/src/H5Sselect.c b/src/H5Sselect.c
index 494c956..422e9ed 100644
--- a/src/H5Sselect.c
+++ b/src/H5Sselect.c
@@ -126,6 +126,7 @@ H5S_select_offset(H5S_t *space, const hssize_t *offset)
/* Check args */
assert(space);
+ assert(space->extent.u.simple.rank);
assert(offset);
/* Allocate space for new offset */
@@ -178,10 +179,14 @@ H5S_select_copy (H5S_t *dst, const H5S_t *src)
/* Need to copy order information still */
/* Copy offset information */
- if (NULL==(dst->select.offset = H5FL_ARR_CALLOC(hssize_t,src->extent.u.simple.rank)))
- HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed");
- if(src->select.offset!=NULL)
- HDmemcpy(dst->select.offset,src->select.offset,(src->extent.u.simple.rank*sizeof(hssize_t)));
+ if(src->extent.u.simple.rank>0) {
+ if (NULL==(dst->select.offset = H5FL_ARR_CALLOC(hssize_t,src->extent.u.simple.rank)))
+ HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed");
+ if(src->select.offset!=NULL)
+ HDmemcpy(dst->select.offset,src->select.offset,(src->extent.u.simple.rank*sizeof(hssize_t)));
+ } /* end if */
+ else
+ dst->select.offset=NULL;
/* Perform correct type of copy based on the type of selection */
switch (src->extent.type) {
@@ -596,12 +601,16 @@ H5S_select_iter_init(H5S_sel_iter_t *sel_iter, const H5S_t *space, size_t elmt_s
/* Save the dataspace's rank */
sel_iter->rank=space->extent.u.simple.rank;
- /* Allocate room for the dataspace dimensions */
- sel_iter->dims = H5FL_ARR_MALLOC(hsize_t,sel_iter->rank);
- assert(sel_iter->dims);
+ if(sel_iter->rank>0) {
+ /* Allocate room for the dataspace dimensions */
+ sel_iter->dims = H5FL_ARR_MALLOC(hsize_t,sel_iter->rank);
+ assert(sel_iter->dims);
- /* Keep a copy of the dataspace dimensions */
- HDmemcpy(sel_iter->dims,space->extent.u.simple.size,sel_iter->rank*sizeof(hsize_t));
+ /* Keep a copy of the dataspace dimensions */
+ HDmemcpy(sel_iter->dims,space->extent.u.simple.size,sel_iter->rank*sizeof(hsize_t));
+ } /* end if */
+ else
+ sel_iter->dims = NULL;
/* Call initialization routine for selection type */
ret_value= (*space->select.iter_init)(sel_iter, space, elmt_size);