diff options
| author | Neil Fortner <nfortne2@hdfgroup.org> | 2009-10-27 21:29:54 (GMT) |
|---|---|---|
| committer | Neil Fortner <nfortne2@hdfgroup.org> | 2009-10-27 21:29:54 (GMT) |
| commit | 3df83b192dbac78e5cb90a8933c24476cbc4b214 (patch) | |
| tree | 4c760101eaead171d75a6f165530068bff2bad04 /src | |
| parent | 34c8292e76d33024e11e74c864a410b321f5dd5a (diff) | |
| download | hdf5-3df83b192dbac78e5cb90a8933c24476cbc4b214.zip hdf5-3df83b192dbac78e5cb90a8933c24476cbc4b214.tar.gz hdf5-3df83b192dbac78e5cb90a8933c24476cbc4b214.tar.bz2 | |
[svn-r17755] Purpose: Fix assertion failure caused by H5Tcommit1/2
Description:
Calling H5Tcommit_anon on a file with read only access would cause an
assertion failure. Added a check to H5T_commit to return a failure in
this case. Removed redundant check in H5T_commit_named.
Tested: Fedora 11 (very minor change)
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5Tcommit.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/H5Tcommit.c b/src/H5Tcommit.c index ebdf283..dea6bed 100644 --- a/src/H5Tcommit.c +++ b/src/H5Tcommit.c @@ -199,10 +199,6 @@ H5T_commit_named(const H5G_loc_t *loc, const char *name, H5T_t *dt, HDassert(tapl_id != H5P_DEFAULT); HDassert(dxpl_id != H5P_DEFAULT); - /* Check if we are allowed to write to this file */ - if(0 == (H5F_INTENT(loc->oloc->file) & H5F_ACC_RDWR)) - HGOTO_ERROR(H5E_DATATYPE, H5E_WRITEERROR, FAIL, "no write intent on file") - /* Record the type's state so that we can revert to it if linking fails */ old_state = dt->shared->state; @@ -338,6 +334,10 @@ H5T_commit(H5F_t *file, H5T_t *type, hid_t tcpl_id, hid_t dxpl_id) HDassert(type); HDassert(tcpl_id != H5P_DEFAULT); + /* Check if we are allowed to write to this file */ + if(0 == (H5F_INTENT(file) & H5F_ACC_RDWR)) + HGOTO_ERROR(H5E_DATATYPE, H5E_WRITEERROR, FAIL, "no write intent on file") + /* * Check arguments. We cannot commit an immutable type because H5Tclose() * normally fails on such types (try H5Tclose(H5T_NATIVE_INT)) but closing |