diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2019-01-28 14:30:14 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2019-01-28 14:30:14 (GMT) |
| commit | caa7875ee4035ef1667a9026fc191b25005bd491 (patch) | |
| tree | 091aa5bc51862fb51e73729f09c16a68c26a83f3 /src | |
| parent | fec7c48a4b2504f0ee6304534dd8f742a08ee05a (diff) | |
| parent | 611ecb5db4051cbf762cc24944ee75ea5284c5d2 (diff) | |
| download | hdf5-caa7875ee4035ef1667a9026fc191b25005bd491.zip hdf5-caa7875ee4035ef1667a9026fc191b25005bd491.tar.gz hdf5-caa7875ee4035ef1667a9026fc191b25005bd491.tar.bz2 | |
Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_10)
* commit '611ecb5db4051cbf762cc24944ee75ea5284c5d2':
Fixed HDFFV-10578
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5Ocache.c | 3 | ||||
| -rw-r--r-- | src/H5VM.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/H5Ocache.c b/src/H5Ocache.c index 1d69028..1fa4b10 100644 --- a/src/H5Ocache.c +++ b/src/H5Ocache.c @@ -1390,7 +1390,8 @@ H5O__chunk_deserialize(H5O_t *oh, haddr_t addr, size_t len, const uint8_t *image /* Message size */ UINT16DECODE(chunk_image, mesg_size); - HDassert(mesg_size == H5O_ALIGN_OH(oh, mesg_size)); + if(mesg_size != H5O_ALIGN_OH(oh, mesg_size)) + HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, FAIL, "message not aligned") /* Message flags */ flags = *chunk_image++; @@ -1548,7 +1548,7 @@ done: * * Purpose: Given source and destination buffers in memory (SRC & DST) * copy sequences of from the source buffer into the destination - * buffer. Each set of sequnces has an array of lengths, an + * buffer. Each set of sequences has an array of lengths, an * array of offsets, the maximum number of sequences and the * current sequence to start at in the sequence. * |