diff options
| author | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2019-01-28 06:23:27 (GMT) |
|---|---|---|
| committer | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2019-01-28 06:23:27 (GMT) |
| commit | 611ecb5db4051cbf762cc24944ee75ea5284c5d2 (patch) | |
| tree | 57149b4c5dd277774eb2f2a20b03d77cf8859702 /src | |
| parent | 01baff97f6f2f358b9361d9b84590074ea5f3127 (diff) | |
| parent | 2880ef43eb03526e7d75551720547b85e66a3086 (diff) | |
| download | hdf5-611ecb5db4051cbf762cc24944ee75ea5284c5d2.zip hdf5-611ecb5db4051cbf762cc24944ee75ea5284c5d2.tar.gz hdf5-611ecb5db4051cbf762cc24944ee75ea5284c5d2.tar.bz2 | |
Merge pull request #1480 in HDFFV/hdf5 from ~BMRIBLER/hdf5_1_10_bmr:hdf5_1_10 to hdf5_1_10
* commit '2880ef43eb03526e7d75551720547b85e66a3086':
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. * |