diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2018-05-11 18:59:48 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2018-05-11 18:59:48 (GMT) |
| commit | ab70b0e7c2fabe222f3c2093164f9e29f2c22c66 (patch) | |
| tree | 921f8be559f9c871f9afcaeb5dcd21bdcb585b1a /src/H5Olinfo.c | |
| parent | 731737845c15958cbe1ceb9141cbaf9e4acf4813 (diff) | |
| parent | fb55d82aa44309df76d4c3e6a8a3d5f2c2ac7792 (diff) | |
| download | hdf5-ab70b0e7c2fabe222f3c2093164f9e29f2c22c66.zip hdf5-ab70b0e7c2fabe222f3c2093164f9e29f2c22c66.tar.gz hdf5-ab70b0e7c2fabe222f3c2093164f9e29f2c22c66.tar.bz2 | |
Merge pull request #1052 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_8 to hdf5_1_8
* commit 'fb55d82aa44309df76d4c3e6a8a3d5f2c2ac7792':
Address compile errors and merge conflicts.
Remove added files.
Fix for HDFFV-10355 (CVE-2017-17506).
Diffstat (limited to 'src/H5Olinfo.c')
| -rw-r--r-- | src/H5Olinfo.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/H5Olinfo.c b/src/H5Olinfo.c index 03e545f..a612ae5 100644 --- a/src/H5Olinfo.c +++ b/src/H5Olinfo.c @@ -36,7 +36,7 @@ /* PRIVATE PROTOTYPES */ static void *H5O_linfo_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_linfo_encode(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mesg); static void *H5O_linfo_copy(const void *_mesg, void *_dest); static size_t H5O_linfo_size(const H5F_t *f, hbool_t disable_shared, const void *_mesg); @@ -113,7 +113,8 @@ H5FL_DEFINE_STATIC(H5O_linfo_t); */ static void * H5O_linfo_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_linfo_t *linfo = NULL; /* Link info */ unsigned char index_flags; /* Flags for encoding link index info */ |