diff options
| author | Neil Fortner <nfortne2@hdfgroup.org> | 2016-07-11 18:19:35 (GMT) |
|---|---|---|
| committer | Neil Fortner <nfortne2@hdfgroup.org> | 2016-07-11 18:19:35 (GMT) |
| commit | e1d50d498a0affbbd6e088b524fd495ea95dea88 (patch) | |
| tree | e4397791c3dff3646a489accb3185c9473254e61 | |
| parent | 2bee235cf9a31fb12856eabfadd90a27eb2bb200 (diff) | |
| download | hdf5-e1d50d498a0affbbd6e088b524fd495ea95dea88.zip hdf5-e1d50d498a0affbbd6e088b524fd495ea95dea88.tar.gz hdf5-e1d50d498a0affbbd6e088b524fd495ea95dea88.tar.bz2 | |
[svn-r30166] Merge revision 30131 to 1.8 branch
Fix bug reported by Cisco Talos TALOS-CAN-0178. Added check for a message that
should not be sharable being marked as sharable on disk, returns failure in
this case. Needs testing.
Tested: ummon (trunk) h5committest (1.8)
| -rw-r--r-- | release_docs/RELEASE.txt | 5 | ||||
| -rw-r--r-- | src/H5Ocache.c | 4 | ||||
| -rw-r--r-- | src/H5Opkg.h | 1 |
3 files changed, 10 insertions, 0 deletions
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index 87ddb04..f8bf5b0 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -255,6 +255,11 @@ Bug Fixes since HDF5-1.8.16 Library ------- + - Fixed a memory bug that could occur when a message was improperly marked + as sharable on disk. + + (NAF, 2016/07/01, HDFFV-9950) + - Fixed some format string warnings that prevent compiling with -Werror=format-security on gcc. diff --git a/src/H5Ocache.c b/src/H5Ocache.c index 9057223..2aaf933 100644 --- a/src/H5Ocache.c +++ b/src/H5Ocache.c @@ -1134,6 +1134,10 @@ H5O_chunk_deserialize(H5O_t *oh, haddr_t addr, size_t len, const uint8_t *image, HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, FAIL, "bad flag combination for message") if((flags & H5O_MSG_FLAG_WAS_UNKNOWN) && !(flags & H5O_MSG_FLAG_MARK_IF_UNKNOWN)) HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, FAIL, "bad flag combination for message") + if((flags & H5O_MSG_FLAG_SHAREABLE) + && H5O_msg_class_g[id] + && !(H5O_msg_class_g[id]->share_flags & H5O_SHARE_IS_SHARABLE)) + HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, FAIL, "message of unsharable class flagged as sharable") /* Reserved bytes/creation index */ if(oh->version == H5O_VERSION_1) diff --git a/src/H5Opkg.h b/src/H5Opkg.h index ff52537..2c8c5a0 100644 --- a/src/H5Opkg.h +++ b/src/H5Opkg.h @@ -201,6 +201,7 @@ \ /* Set the message's "shared info", if it's shareable */ \ if((MSG)->flags & H5O_MSG_FLAG_SHAREABLE) { \ + HDassert(msg_type->share_flags & H5O_SHARE_IS_SHARABLE); \ H5O_UPDATE_SHARED((H5O_shared_t *)(MSG)->native, H5O_SHARE_TYPE_HERE, (F), msg_type->id, (MSG)->crt_idx, (OH)->chunk[0].addr) \ } /* end if */ \ \ |