summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeil Fortner <nfortne2@hdfgroup.org>2008-08-17 18:04:05 (GMT)
committerNeil Fortner <nfortne2@hdfgroup.org>2008-08-17 18:04:05 (GMT)
commit936e52b581b3f4739e12c331d93ba6259a2cb5e0 (patch)
tree9b7150c3d1d75e8dcd85a171bfecf56cbbe26429
parent709c81d71084c9afc667de7bef86bea1566a68a8 (diff)
downloadhdf5-936e52b581b3f4739e12c331d93ba6259a2cb5e0.zip
hdf5-936e52b581b3f4739e12c331d93ba6259a2cb5e0.tar.gz
hdf5-936e52b581b3f4739e12c331d93ba6259a2cb5e0.tar.bz2
[svn-r15477] Removed vestigal code from H5SM_delete_from_index() which would have
dereferenced an uninitialized pointer if it had been reachable. Closes bz #1280. Tested: kagiso, smirom, linew (h5committest)
-rwxr-xr-xsrc/H5SM.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/src/H5SM.c b/src/H5SM.c
index 9607f23..e5373f4 100755
--- a/src/H5SM.c
+++ b/src/H5SM.c
@@ -1582,8 +1582,6 @@ H5SM_delete_from_index(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
H5HF_t *fheap = NULL; /* Fractal heap that contains the message */
size_t buf_size; /* Size of the encoded message (out) */
void *encoding_buf = NULL; /* The encoded message (out) */
- H5O_loc_t oloc; /* Object location for message in object header */
- H5O_t *oh = NULL; /* Object header for message in object header */
unsigned type_id; /* Message type to operate on */
herr_t ret_value = SUCCEED;
@@ -1716,15 +1714,6 @@ H5SM_delete_from_index(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
} /* end if */
done:
- /* Unprotect & close the object header if we opened one */
- if(oh && oh != open_oh) {
- if(H5AC_unprotect(oloc.file, dxpl_id, H5AC_OHDR, oloc.addr, oh, H5AC__NO_FLAGS_SET) < 0)
- HDONE_ERROR(H5E_OHDR, H5E_PROTECT, FAIL, "unable to release object header")
-
- if(H5O_close(&oloc) < 0)
- HDONE_ERROR(H5E_OHDR, H5E_CANTRELEASE, FAIL, "unable to close object header")
- } /* end if */
-
/* Release the SOHM list */
if(list && H5AC_unprotect(f, dxpl_id, H5AC_SOHM_LIST, header->index_addr, list, H5AC__DIRTIED_FLAG) < 0)
HDONE_ERROR(H5E_CACHE, H5E_CANTUNPROTECT, FAIL, "unable to close SOHM index")