summaryrefslogtreecommitdiffstats
path: root/src/H5Obtreek.c
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2018-03-06 14:29:55 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2018-03-06 14:29:55 (GMT)
commit1c3ba3721718c8089da65fae02f65068d8530fa7 (patch)
tree2b2e1f5e70aa8208e75e34edd5077ca0b1cfa939 /src/H5Obtreek.c
parent8ae5f6804186e3121dfe933d6bf9c9044f8ae9d6 (diff)
parentd8723ac1178a69c4dff7164203d999d61c2159bb (diff)
downloadhdf5-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/H5Obtreek.c')
-rw-r--r--src/H5Obtreek.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/H5Obtreek.c b/src/H5Obtreek.c
index 4fd0577..1d2b607 100644
--- a/src/H5Obtreek.c
+++ b/src/H5Obtreek.c
@@ -28,7 +28,7 @@
#include "H5MMprivate.h" /* Memory management */
static void *H5O_btreek_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_btreek_encode(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mesg);
static void *H5O_btreek_copy(const void *_mesg, void *_dest);
static size_t H5O_btreek_size(const H5F_t *f, hbool_t disable_shared, const void *_mesg);
@@ -79,7 +79,8 @@ const H5O_msg_class_t H5O_MSG_BTREEK[1] = {{
*/
static void *
H5O_btreek_decode(H5F_t H5_ATTR_UNUSED *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_btreek_t *mesg; /* Native message */
void *ret_value = NULL; /* Return value */