diff options
author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2016-02-18 20:50:37 (GMT) |
---|---|---|
committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2016-02-18 20:50:37 (GMT) |
commit | 70ad55b1052e018acd90b22ab44260a8a1721e0b (patch) | |
tree | 5211dad79d57dcc3875f443557918db8a1b5c6a6 /src/H5B2pkg.h | |
parent | b3df4e9c8d716db4ea2680f6bb4ac16d1084dea5 (diff) | |
download | hdf5-70ad55b1052e018acd90b22ab44260a8a1721e0b.zip hdf5-70ad55b1052e018acd90b22ab44260a8a1721e0b.tar.gz hdf5-70ad55b1052e018acd90b22ab44260a8a1721e0b.tar.bz2 |
[svn-r29150] fix for Jira issue 9670 - HDF5 segfaults on corrupted file.
Change compare callback in Btree2 class to correctly account for errors.
tested on bb-8.
Diffstat (limited to 'src/H5B2pkg.h')
-rw-r--r-- | src/H5B2pkg.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5B2pkg.h b/src/H5B2pkg.h index 2b2c145..edac296 100644 --- a/src/H5B2pkg.h +++ b/src/H5B2pkg.h @@ -365,8 +365,8 @@ H5_DLL herr_t H5B2__node_size(H5B2_hdr_t *hdr, hid_t dxpl_id, uint16_t depth, const H5B2_node_ptr_t *curr_node, hsize_t *op_data); /* Routines for locating records */ -H5_DLL int H5B2__locate_record(const H5B2_class_t *type, unsigned nrec, - size_t *rec_off, const uint8_t *native, const void *udata, unsigned *idx); +H5_DLL herr_t H5B2__locate_record(const H5B2_class_t *type, unsigned nrec, + size_t *rec_off, const uint8_t *native, const void *udata, unsigned *idx, int *result); H5_DLL herr_t H5B2__neighbor_internal(H5B2_hdr_t *hdr, hid_t dxpl_id, uint16_t depth, H5B2_node_ptr_t *curr_node_ptr, void *neighbor_loc, H5B2_compare_t comp, void *udata, H5B2_found_t op, void *op_data); |