diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2021-08-23 18:50:17 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-23 18:50:17 (GMT) |
| commit | f8ecdf846c7e054d874ea92baf5c9b6c2b47e836 (patch) | |
| tree | eb33b014a18e87bf9df4dfa21b532af5c288c225 /test | |
| parent | 0a9099807a127a74b35ecf2c4ad98d6571f2e753 (diff) | |
| download | hdf5-f8ecdf846c7e054d874ea92baf5c9b6c2b47e836.zip hdf5-f8ecdf846c7e054d874ea92baf5c9b6c2b47e836.tar.gz hdf5-f8ecdf846c7e054d874ea92baf5c9b6c2b47e836.tar.bz2 | |
1.12 Tools merges from develop (#949)
* Tools merges from develop
Brings the tools getopt(3) replacement into the main library (#803)
Perform option arg variables (#834)
Removes unused commented-out code from h5jamgentest.c (#851)
Reorg tools perform to provide h5perf for installation (#884)
* Fix missing files
* Remove empty files
* Remove empty file
* Resync defines
* Fix endif typo
* Add Makfile to list
* Fix typo
* Remove H5_GCC_DIAG_ON line to match removal of H5_GCC_DIAG_OFF line in
sio_engine.c/
Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>
Co-authored-by: Larry Knox <lrknox@hdfgroup.org>
Diffstat (limited to 'test')
| -rw-r--r-- | test/h5test.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/test/h5test.c b/test/h5test.c index b37409a..bb2f5cc 100644 --- a/test/h5test.c +++ b/test/h5test.c @@ -1237,9 +1237,10 @@ h5_set_info_object(void) valp++; /* copy key/value pair into temporary buffer */ - len = strcspn(valp, ";"); - next = &valp[len]; - key_val = (char *)HDcalloc(1, len + 1); + len = HDstrcspn(valp, ";"); + next = &valp[len]; + if (NULL == (key_val = (char *)HDcalloc(1, len + 1))) + return -1; /* increment the next pointer past the terminating semicolon */ if (*next == ';') @@ -1635,6 +1636,9 @@ h5_make_local_copy(const char *origfilename, const char *local_copy_name) void * buf = NULL; /* Buffer for copying data */ const char *filename = H5_get_srcdir_filename(origfilename); /* Get the test file name to copy */ + if (!filename) + goto error; + /* Allocate copy buffer */ if (NULL == (buf = HDcalloc((size_t)1, (size_t)READ_BUF_SIZE))) goto error; |