diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2019-06-21 20:48:53 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2019-06-21 20:48:53 (GMT) |
| commit | 8eabdd28af1c7f058588e634a2d4fbaab3bb81f1 (patch) | |
| tree | 32798251eb4e916c94fdb40ad00222925de311b4 | |
| parent | 5fc5d947f084d1ef5d4c4a0bc2be55baa181f0fa (diff) | |
| parent | b4bd49ffdd5e313cd840698709f44f05ea323104 (diff) | |
| download | hdf5-8eabdd28af1c7f058588e634a2d4fbaab3bb81f1.zip hdf5-8eabdd28af1c7f058588e634a2d4fbaab3bb81f1.tar.gz hdf5-8eabdd28af1c7f058588e634a2d4fbaab3bb81f1.tar.bz2 | |
Merge pull request #1760 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:t_filters_parallel_bugs to develop
* commit 'b4bd49ffdd5e313cd840698709f44f05ea323104':
Fixed some low-hanging fruit from -fsanitize in t_filters_parallel.
| -rw-r--r-- | src/H5Dmpio.c | 5 | ||||
| -rw-r--r-- | testpar/t_filters_parallel.c | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/H5Dmpio.c b/src/H5Dmpio.c index ee8bde2..467b1b7 100644 --- a/src/H5Dmpio.c +++ b/src/H5Dmpio.c @@ -2806,8 +2806,9 @@ H5D__chunk_redistribute_shared_chunks(const H5D_io_info_t *io_info, const H5D_ty /* Sort the new list in order of previous owner so that each original owner of a chunk * entry gets that entry back, with the possibly newly-modified "new_owner" field */ - HDqsort(shared_chunks_info_array, shared_chunks_info_array_num_entries, - sizeof(H5D_filtered_collective_io_info_t), H5D__cmp_filtered_collective_io_info_entry_owner); + if(shared_chunks_info_array_num_entries > 1) + HDqsort(shared_chunks_info_array, shared_chunks_info_array_num_entries, + sizeof(H5D_filtered_collective_io_info_t), H5D__cmp_filtered_collective_io_info_entry_owner); send_displacements[0] = 0; for (i = 1; i < (size_t) mpi_size; i++) diff --git a/testpar/t_filters_parallel.c b/testpar/t_filters_parallel.c index 1f26e0d..db5bd13 100644 --- a/testpar/t_filters_parallel.c +++ b/testpar/t_filters_parallel.c @@ -3683,6 +3683,8 @@ test_read_filtered_dataset_point_selection(void) if (read_buf) HDfree(read_buf); if (correct_buf) HDfree(correct_buf); + HDfree(coords); + VRFY((H5Dclose(dset_id) >= 0), "Dataset close succeeded"); VRFY((H5Sclose(filespace) >= 0), "File dataspace close succeeded"); VRFY((H5Sclose(memspace) >= 0), "Memory dataspace close succeeded"); @@ -5791,6 +5793,9 @@ test_write_parallel_read_serial(void) VRFY((H5Dclose(dset_id) >= 0), "Dataset close succeeded"); VRFY((H5Fclose(file_id) >= 0), "File close succeeded"); + + HDfree(correct_buf); + HDfree(read_buf); } return; |