diff options
| author | Neil Fortner <nfortne2@hdfgroup.org> | 2009-01-29 20:43:16 (GMT) |
|---|---|---|
| committer | Neil Fortner <nfortne2@hdfgroup.org> | 2009-01-29 20:43:16 (GMT) |
| commit | ec614163246fb78844d773b58b12d4451a4acaa4 (patch) | |
| tree | 3f02a3e584278a5a94778659fac257033a6a73a9 /src/H5Ocopy.c | |
| parent | 9a298fd1dda2ed9b12e68cc64ccce5c95216fd6a (diff) | |
| download | hdf5-ec614163246fb78844d773b58b12d4451a4acaa4.zip hdf5-ec614163246fb78844d773b58b12d4451a4acaa4.tar.gz hdf5-ec614163246fb78844d773b58b12d4451a4acaa4.tar.bz2 | |
[svn-r16376] Purpose: Fix a bug encountered when copying shared messages
Description: When attempting to copy an object with a message shared in its own
object header, the library attempts to protect the same object header twice.
Previously, it was possible for the object header to be protected with write
access in one or both of these protects, which would be illegal. The library
should now always protect with read only access in this case. The conditions
for fixing incorrect datatype versions have been made weaker to support this
change. The version will only be corrected if the object header the datatype
is in is modified.
Tested: jam, smirom (h5committest)
Diffstat (limited to 'src/H5Ocopy.c')
| -rw-r--r-- | src/H5Ocopy.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/H5Ocopy.c b/src/H5Ocopy.c index 9a905d2..5334539 100644 --- a/src/H5Ocopy.c +++ b/src/H5Ocopy.c @@ -315,8 +315,7 @@ H5O_copy_header_real(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out */, HDassert(cpy_info); /* Get source object header */ - if(NULL == (oh_src = (H5O_t *)H5AC_protect(oloc_src->file, dxpl_id, H5AC_OHDR, oloc_src->addr, NULL, NULL, - (H5F_get_intent(oloc_src->file) & H5F_ACC_RDWR) ? H5AC_WRITE : H5AC_READ))) + if(NULL == (oh_src = (H5O_t *)H5AC_protect(oloc_src->file, dxpl_id, H5AC_OHDR, oloc_src->addr, NULL, NULL, H5AC_READ))) HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, FAIL, "unable to load object header") /* Get pointer to object class for this object */ |