diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2019-11-21 15:33:23 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2019-11-21 15:33:23 (GMT) |
| commit | 772846eb05400e834387d74a22656e969c6f3208 (patch) | |
| tree | dc28cc0aff2187ecadb5fcc7c3ee23b761d7c4c0 /src | |
| parent | 5fe5caf560d6de0940cfb5e5ccc77e43a6f82c3b (diff) | |
| parent | 33d173d672f4affc804cf6e3c43b92693bd3ed68 (diff) | |
| download | hdf5-772846eb05400e834387d74a22656e969c6f3208.zip hdf5-772846eb05400e834387d74a22656e969c6f3208.tar.gz hdf5-772846eb05400e834387d74a22656e969c6f3208.tar.bz2 | |
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '33d173d672f4affc804cf6e3c43b92693bd3ed68':
Modify H5Ssel_iter_get_seq_list() to accept iterators that have reached the end of iteration (returning zero sequences). Previously it could cause an assertion failure.
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5Sselect.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/H5Sselect.c b/src/H5Sselect.c index 65a66cb..c506218 100644 --- a/src/H5Sselect.c +++ b/src/H5Sselect.c @@ -2907,7 +2907,7 @@ H5Ssel_iter_get_seq_list(hid_t sel_iter_id, size_t maxseq, size_t maxbytes, HGOTO_ERROR(H5E_DATASPACE, H5E_BADVALUE, FAIL, "length array pointer is NULL") /* Get the sequences of bytes */ - if(maxseq > 0 && maxbytes > 0) { + if(maxseq > 0 && maxbytes > 0 && sel_iter->elmt_left > 0) { if(H5S_SELECT_ITER_GET_SEQ_LIST(sel_iter, maxseq, maxbytes, nseq, nbytes, off, len) < 0) HGOTO_ERROR(H5E_DATASPACE, H5E_CANTGET, FAIL, "sequence length generation failed") } /* end if */ |