summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVailin Choi <vchoi@jam.ad.hdfgroup.org>2018-12-31 06:11:45 (GMT)
committerVailin Choi <vchoi@jam.ad.hdfgroup.org>2018-12-31 06:11:45 (GMT)
commite035c7abdde07ec8062461e16315e87f9924a7c5 (patch)
tree38e983f1b7fb8e33383386d5b4a06ba687f909f9
parentf808c108ed0315f115a7c69cbd8ee95032a64b34 (diff)
downloadhdf5-e035c7abdde07ec8062461e16315e87f9924a7c5.zip
hdf5-e035c7abdde07ec8062461e16315e87f9924a7c5.tar.gz
hdf5-e035c7abdde07ec8062461e16315e87f9924a7c5.tar.bz2
Changes based on feedback from pull request.
-rw-r--r--MANIFEST4
-rw-r--r--configure.ac2
-rw-r--r--release_docs/RELEASE.txt4
-rw-r--r--src/H5Adense.c1
-rw-r--r--test/del_many_dense_attrs.c4
-rw-r--r--test/testabort_fail.sh.in2
6 files changed, 9 insertions, 8 deletions
diff --git a/MANIFEST b/MANIFEST
index cc2ddc0..1d8f586 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -968,6 +968,7 @@
./test/cross_read.c
./test/dangle.c
./test/deflate.h5
+./test/del_many_dense_attrs.c
./test/direct_chunk.c
./test/dsets.c
./test/dt_arith.c
@@ -996,7 +997,6 @@
./test/filespace_1_6.h5
./test/freespace.c
./test/filenotclosed.c
-./test/del_many_dense_attrs.c
./test/file_image.c
./test/file_image_core_test.h5
./test/fill_old.h5
@@ -1101,10 +1101,10 @@
./test/tcheck_version.c
./test/tconfig.c
./test/tcoords.c
+./test/testabort_fail.sh.in
./test/testcheck_version.sh.in
./test/testerror.sh.in
./test/testlinks_env.sh.in
-./test/testabort_fail.sh.in
./test/test_filter_plugin.sh.in
./test/testflushrefresh.sh.in
./test/testframe.c
diff --git a/configure.ac b/configure.ac
index a583353..3459b23 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3399,6 +3399,7 @@ AC_CONFIG_FILES([src/libhdf5.settings
src/Makefile
test/Makefile
test/H5srcdir_str.h
+ test/testabort_fail.sh
test/testcheck_version.sh
test/testerror.sh
test/testflushrefresh.sh
@@ -3406,7 +3407,6 @@ AC_CONFIG_FILES([src/libhdf5.settings
test/testlinks_env.sh
test/testswmr.sh
test/testvdsswmr.sh
- test/testabort_fail.sh
test/test_filter_plugin.sh
test/test_usecases.sh
testpar/Makefile
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 37e863b..7e44fd4 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -243,10 +243,10 @@ Bug Fixes since HDF5-1.10.3 release
Library
-------
- - Deleting attributes in densed storage
+ - Deleting attributes in dense storage
The library abort with "infinite loop closing library" after
- attributes in densed storage are created and then deleted.
+ attributes in dense storage are created and then deleted.
When deleting the attribute nodes from the name index v2 B-tree,
if an attribute is found in the intermediate B-tree nodes,
diff --git a/src/H5Adense.c b/src/H5Adense.c
index 18cdfe9..021fa76 100644
--- a/src/H5Adense.c
+++ b/src/H5Adense.c
@@ -307,6 +307,7 @@ H5A__dense_fnd_cb(const H5A_t *attr, hbool_t *took_ownership, void *_user_attr)
/* Check arguments */
HDassert(attr);
HDassert(user_attr);
+ HDassert(took_ownership);
/*
* If there is an attribute already stored in "user_attr",
* we need to free the dynamially allocated spaces for the
diff --git a/test/del_many_dense_attrs.c b/test/del_many_dense_attrs.c
index 5ca51d9..bbae48d 100644
--- a/test/del_many_dense_attrs.c
+++ b/test/del_many_dense_attrs.c
@@ -13,7 +13,7 @@
/*
* Purpose: Test to verify that the infinite loop closing library/abort failure
- * is fixed when the application creates and removes densed attributes
+ * is fixed when the application creates and removes dense attributes
* (See HDFFV-10659).
*/
@@ -49,7 +49,7 @@ static void catch_signal(int H5_ATTR_UNUSED signo)
* Function: main
*
* Purpose: Test to verify that the infinite loop closing library/abort failure
- * is fixed when the application creates and removes densed attributes
+ * is fixed when the application creates and removes dense attributes
* (See HDFFV-10659).
*
* Return: Success: exit(EXIT_SUCCESS)
diff --git a/test/testabort_fail.sh.in b/test/testabort_fail.sh.in
index 90f8077..925d8a4 100644
--- a/test/testabort_fail.sh.in
+++ b/test/testabort_fail.sh.in
@@ -15,7 +15,7 @@
# does not close the file. (See HDFFV-10160)
#
# Test to verify that the infinite loop closing library/abort failure is fixed
-# when the application creates and removes densed attributes (See HDFFV-10659)
+# when the application creates and removes dense attributes (See HDFFV-10659)
srcdir=@srcdir@