diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-03-06 14:29:55 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-03-06 14:29:55 (GMT) |
| commit | 1c3ba3721718c8089da65fae02f65068d8530fa7 (patch) | |
| tree | 2b2e1f5e70aa8208e75e34edd5077ca0b1cfa939 /src/H5Olayout.c | |
| parent | 8ae5f6804186e3121dfe933d6bf9c9044f8ae9d6 (diff) | |
| parent | d8723ac1178a69c4dff7164203d999d61c2159bb (diff) | |
| download | hdf5-1c3ba3721718c8089da65fae02f65068d8530fa7.zip hdf5-1c3ba3721718c8089da65fae02f65068d8530fa7.tar.gz hdf5-1c3ba3721718c8089da65fae02f65068d8530fa7.tar.bz2 | |
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit 'd8723ac1178a69c4dff7164203d999d61c2159bb':
Fix for HDFFV-10357 (CVE-2017-17508).
Fix for HDFFV-10355 (CVE-2017-17506).
Fix for HDFFV-10354 (CVE-2017-17505).
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; |