From 5dfdf41dfc2ca4f22529effacc0913681fae7e34 Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Thu, 15 Apr 2010 16:02:29 -0500 Subject: [svn-r18577] Fix for Bug 1741: H5Rcreate given a region reference with a space_id of -1 throws assert and crashes on Windows machines. Add check for case and return error. Tested: Windows amd local linux --- src/H5R.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/H5R.c b/src/H5R.c index d14b9fc..ada2269 100644 --- a/src/H5R.c +++ b/src/H5R.c @@ -309,7 +309,7 @@ herr_t H5Rcreate(void *ref, hid_t loc_id, const char *name, H5R_type_t ref_type, hid_t space_id) { H5G_loc_t loc; /* File location */ - H5S_t *space; /* Pointer to dataspace containing region */ + H5S_t *space = NULL; /* Pointer to dataspace containing region */ herr_t ret_value; /* Return value */ FUNC_ENTER_API(H5Rcreate, FAIL) @@ -326,6 +326,8 @@ H5Rcreate(void *ref, hid_t loc_id, const char *name, H5R_type_t ref_type, hid_t HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid reference type") if(ref_type != H5R_OBJECT && ref_type != H5R_DATASET_REGION) HGOTO_ERROR(H5E_ARGS, H5E_UNSUPPORTED, FAIL, "reference type not supported") + if(space_id == (-1) && ref_type == H5R_DATASET_REGION) + HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "reference region dataspace id must be valid") if(space_id != (-1) && (NULL == (space = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE)))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataspace") -- cgit v0.12