diff --git a/dap4_test/Makefile.am b/dap4_test/Makefile.am index 276767078f..17eee31a31 100644 --- a/dap4_test/Makefile.am +++ b/dap4_test/Makefile.am @@ -44,7 +44,8 @@ pingurl4_SOURCES = pingurl4.c if ENABLE_DAP_REMOTE_TESTS if BUILD_UTILITIES # relies on ncdump - TESTS += test_hyrax.sh test_thredds.sh + TESTS += test_hyrax.sh +# TESTS += test_thredds.sh if AX_IGNORE TESTS += test_remote.sh endif diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt index 6a310a0f27..119d23eece 100644 --- a/docs/CMakeLists.txt +++ b/docs/CMakeLists.txt @@ -95,6 +95,6 @@ obsolete/fan_utils.html bestpractices.md filters.md indexing.md inmemory.md DAP2.dox FAQ.md known_problems.md COPYRIGHT.dox user_defined_formats.md DAP4.md DAP4.dox -testserver.dox byterange.dox filters.md nczarr.md auth.md quantize.md) +testserver.dox byterange.md filters.md nczarr.md auth.md quantize.md) ADD_EXTRA_DIST("${CUR_EXTRA_DIST}") diff --git a/docs/Makefile.am b/docs/Makefile.am index e6e8a84e68..df5fac746b 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -13,7 +13,7 @@ windows-binaries.md dispatch.md building-with-cmake.md CMakeLists.txt groups.dox notes.md install-fortran.md credits.md auth.md filters.md \ obsolete/fan_utils.html indexing.dox inmemory.md FAQ.md \ known_problems.md COPYRIGHT.md inmeminternal.dox testserver.dox \ -byterange.dox nczarr.md quantize.md all-error-codes.md +byterange.md nczarr.md quantize.md all-error-codes.md # Turn off parallel builds in this directory. .NOTPARALLEL: diff --git a/libdispatch/dvar.c b/libdispatch/dvar.c index 4e78285c5d..f42f2b6aaf 100644 --- a/libdispatch/dvar.c +++ b/libdispatch/dvar.c @@ -1303,6 +1303,9 @@ NC_check_nulls(int ncid, int varid, const size_t *start, size_t **count, pointer back to this function, when you're done with the data, and it will free the string memory. + WARNING: This does not free the data vector itself, only + the strings to which it points. + @param len The number of character arrays in the array. @param data The pointer to the data array. diff --git a/ncdump/utils.c b/ncdump/utils.c index 30e059189e..263ae9f0ab 100644 --- a/ncdump/utils.c +++ b/ncdump/utils.c @@ -987,7 +987,8 @@ void nc_get_att_single_string(const int ncid, const int varid, *str_out = emalloc((att_str_len + 1) * att->tinfo->size); (*str_out)[att_str_len] = '\0'; strncpy(*str_out, att_strings[0], att_str_len); - nc_free_string(att->len, att_strings); + nc_free_string(att->len, att_strings); /* Warning: does not free att_strings */ + free(att_strings); } else { fprintf(stderr,"nc_get_att_single_string: unknown attribute type: %d\n", att->type); fprintf(stderr," must use one of: NC_CHAR, NC_STRING\n");