diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2018-05-11 23:51:03 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2018-05-11 23:51:03 (GMT) |
| commit | 2636f401ba236e99adda4cc50fb89bebbe0b73fd (patch) | |
| tree | 99452a08724f938b10855b906840bd830d7124e8 /src/H5Gent.c | |
| parent | 00f42b152636696f59adb41c527424196c747e2c (diff) | |
| download | hdf5-2636f401ba236e99adda4cc50fb89bebbe0b73fd.zip hdf5-2636f401ba236e99adda4cc50fb89bebbe0b73fd.tar.gz hdf5-2636f401ba236e99adda4cc50fb89bebbe0b73fd.tar.bz2 | |
Moved a fix for HDFFV-10358 (CVE-2017-17509) from develop to 1.8.
This was done manually due to the cache differences between
1.8 and develop.
Diffstat (limited to 'src/H5Gent.c')
| -rw-r--r-- | src/H5Gent.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/H5Gent.c b/src/H5Gent.c index bb6aa38..1bd8e63 100644 --- a/src/H5Gent.c +++ b/src/H5Gent.c @@ -91,7 +91,8 @@ H5FL_BLK_EXTERN(str_buf); *------------------------------------------------------------------------- */ herr_t -H5G__ent_decode_vec(const H5F_t *f, const uint8_t **pp, H5G_entry_t *ent, unsigned n) +H5G__ent_decode_vec(const H5F_t *f, const uint8_t **pp, const uint8_t *p_end, + H5G_entry_t *ent, unsigned n) { unsigned u; /* Local index variable */ herr_t ret_value = SUCCEED; /* Return value */ @@ -104,9 +105,12 @@ H5G__ent_decode_vec(const H5F_t *f, const uint8_t **pp, H5G_entry_t *ent, unsign HDassert(ent); /* decode entries */ - for(u = 0; u < n; u++) + for(u = 0; u < n; u++) { + if(*pp > p_end) + HGOTO_ERROR(H5E_SYM, H5E_CANTDECODE, FAIL, "ran off the end of the buffer") if(H5G_ent_decode(f, pp, ent + u) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTDECODE, FAIL, "can't decode") + } done: FUNC_LEAVE_NOAPI(ret_value) |