diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2018-03-06 00:43:38 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2018-03-06 00:43:38 (GMT) |
| commit | d8723ac1178a69c4dff7164203d999d61c2159bb (patch) | |
| tree | b0681c4b629fb6a44dc3df6d4f7f174ca7cc142d /src/H5Olayout.c | |
| parent | bbadec5680c02dfa975801b964179da9b7c06362 (diff) | |
| parent | b61c93acb3c5d50d379950f6e3de5040c71dd041 (diff) | |
| download | hdf5-d8723ac1178a69c4dff7164203d999d61c2159bb.zip hdf5-d8723ac1178a69c4dff7164203d999d61c2159bb.tar.gz hdf5-d8723ac1178a69c4dff7164203d999d61c2159bb.tar.bz2 | |
Merge pull request #910 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:hdffv_10355 to develop
* commit 'b61c93acb3c5d50d379950f6e3de5040c71dd041':
Fix for HDFFV-10355 (CVE-2017-17506).
Diffstat (limited to 'src/H5Olayout.c')
| -rw-r--r-- | src/H5Olayout.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/H5Olayout.c b/src/H5Olayout.c index 85d7791..553013c 100644 --- a/src/H5Olayout.c +++ b/src/H5Olayout.c @@ -39,7 +39,7 @@ /* PRIVATE PROTOTYPES */ static void *H5O__layout_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, - unsigned mesg_flags, unsigned *ioflags, const uint8_t *p); + unsigned mesg_flags, unsigned *ioflags, size_t p_size, const uint8_t *p); static herr_t H5O__layout_encode(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mesg); static void *H5O__layout_copy(const void *_mesg, void *_dest); static size_t H5O__layout_size(const H5F_t *f, hbool_t disable_shared, const void *_mesg); @@ -101,7 +101,8 @@ H5FL_DEFINE(H5O_layout_t); */ static void * H5O__layout_decode(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *open_oh, - unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags, const uint8_t *p) + unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags, + size_t H5_ATTR_UNUSED p_size, const uint8_t *p) { H5O_layout_t *mesg = NULL; uint8_t *heap_block = NULL; |