summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2005-04-16 16:22:16 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2005-04-16 16:22:16 (GMT)
commit9b68e8e927ecf5cf1e9d10fa46407bd8ac5a0a93 (patch)
tree3aa8cfaba778d1803b598e99a164e9b772311864 /src
parent3c5faf9fb63a303b959d7f2c790ee31485daefa2 (diff)
downloadhdf5-9b68e8e927ecf5cf1e9d10fa46407bd8ac5a0a93.zip
hdf5-9b68e8e927ecf5cf1e9d10fa46407bd8ac5a0a93.tar.gz
hdf5-9b68e8e927ecf5cf1e9d10fa46407bd8ac5a0a93.tar.bz2
[svn-r10620] Purpose:
Bug fix Description: Opening a dataset (or named datatype) with "." for the name and using a group ID for the location ID was not returning an error value. Solution: Check the type of the object before attempting to open it (internally, using a group ID and "." for the name maps to the group object). Platforms tested: FreeBSD 4.11 (sleipnir) Solaris 2.9 (shanti) Too minor to require h5committest
Diffstat (limited to 'src')
-rw-r--r--src/H5D.c10
-rw-r--r--src/H5T.c4
2 files changed, 13 insertions, 1 deletions
diff --git a/src/H5D.c b/src/H5D.c
index be4b3e5..440a9888 100644
--- a/src/H5D.c
+++ b/src/H5D.c
@@ -1233,7 +1233,7 @@ done:
hid_t
H5Dopen(hid_t loc_id, const char *name)
{
- H5D_t *dset;
+ H5D_t *dset = NULL;
H5G_entry_t *loc = NULL; /*location holding the dataset */
H5G_entry_t ent; /*dataset symbol table entry */
hid_t dxpl_id = H5AC_dxpl_id; /* dxpl to use to open datset */
@@ -1252,6 +1252,10 @@ H5Dopen(hid_t loc_id, const char *name)
if (H5G_find(loc, name, NULL, &ent, dxpl_id) < 0)
HGOTO_ERROR(H5E_DATASET, H5E_NOTFOUND, FAIL, "not found")
+ /* Check that the object found is the correct type */
+ if (H5G_get_type(&ent, dxpl_id) != H5G_DATASET)
+ HGOTO_ERROR(H5E_DATASET, H5E_BADTYPE, FAIL, "not a dataset")
+
/* Open the dataset */
if ((dset = H5D_open(&ent, dxpl_id))==NULL)
HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "can't open dataset")
@@ -1261,6 +1265,10 @@ H5Dopen(hid_t loc_id, const char *name)
HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "can't register dataset atom")
done:
+ if(ret_value < 0)
+ if(dset != NULL)
+ if(H5D_close(dset) < 0)
+ HDONE_ERROR(H5E_DATASET, H5E_CLOSEERROR, FAIL, "unable to release dataset")
FUNC_LEAVE_API(ret_value)
}
diff --git a/src/H5T.c b/src/H5T.c
index fe4e9c3..bc20caf 100644
--- a/src/H5T.c
+++ b/src/H5T.c
@@ -1578,6 +1578,10 @@ H5Topen(hid_t loc_id, const char *name)
if (H5G_find (loc, name, NULL, &ent/*out*/, dxpl_id)<0)
HGOTO_ERROR (H5E_DATATYPE, H5E_NOTFOUND, FAIL, "not found");
+ /* Check that the object found is the correct type */
+ if (H5G_get_type(&ent, dxpl_id) != H5G_TYPE)
+ HGOTO_ERROR(H5E_DATASET, H5E_BADTYPE, FAIL, "not a named datatype")
+
/* Open it */
if ((type=H5T_open (&ent, dxpl_id)) ==NULL)
HGOTO_ERROR (H5E_DATATYPE, H5E_CANTOPENOBJ, FAIL, "unable to open named data type");