summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeil Fortner <nfortne2@hdfgroup.org>2009-06-25 18:56:00 (GMT)
committerNeil Fortner <nfortne2@hdfgroup.org>2009-06-25 18:56:00 (GMT)
commit02dc89e00b6ed9c16321861272c06e398832fdb5 (patch)
treed51d263386a1bef9924d4f2469f9ebc964b57b82
parent98b20f5bda4e26f3b4df197f74afed3aeef458f2 (diff)
downloadhdf5-02dc89e00b6ed9c16321861272c06e398832fdb5.zip
hdf5-02dc89e00b6ed9c16321861272c06e398832fdb5.tar.gz
hdf5-02dc89e00b6ed9c16321861272c06e398832fdb5.tar.bz2
[svn-r17108] Purpose: Fix bug in H5Z_filter_info
Description: Previously, when H5Z_filter_info was called for a filter that was not present, it would succeed and return the information from one position past the end of the pipeline, possibly causing a segfault. This affected at least H5Pget_fitler_by_id1/2, and possibly other API functions. Fixed to properly return failure. Tested: jam, linew, smirom (h5committest)
-rw-r--r--release_docs/RELEASE.txt2
-rw-r--r--src/H5Z.c2
-rw-r--r--test/dsets.c11
3 files changed, 14 insertions, 1 deletions
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 0d6d31a..cae90d0 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -167,6 +167,8 @@ Bug Fixes since HDF5-1.8.0 release
Library
-------
+ - Fixed a bug where H5Pget_fitler_by_id would succeed when called for a
+ filter that wasn't present. (NAF - 2009/06/25)
- Fixed an issue with committed compound datatypes containing a vlen.
Also fixed memory leaks involving committed datatypes.
(NAF - 2009/06/10 - 1593)
diff --git a/src/H5Z.c b/src/H5Z.c
index 417ae77..1c58ab0 100644
--- a/src/H5Z.c
+++ b/src/H5Z.c
@@ -1115,7 +1115,7 @@ H5Z_filter_info(const H5O_pline_t *pline, H5Z_filter_t filter)
break;
/* Check if the filter was not already in the pipeline */
- if(idx>pline->nused)
+ if(idx>=pline->nused)
HGOTO_ERROR(H5E_PLINE, H5E_NOTFOUND, NULL, "filter not in pipeline")
/* Set return value */
diff --git a/test/dsets.c b/test/dsets.c
index 71324d8..3357a4e 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -5547,6 +5547,7 @@ test_filter_delete(hid_t file)
hsize_t dims[2]={20,20}; /* dataspace dimensions */
hsize_t chunk_dims[2]={10,10}; /* chunk dimensions */
int nfilters; /* number of filters in DCPL */
+ unsigned flags; /* flags for filter */
herr_t ret; /* generic return value */
int i;
@@ -5587,6 +5588,16 @@ test_filter_delete(hid_t file)
goto error;
}
+ /* try to get the info for the deflate filter */
+ H5E_BEGIN_TRY {
+ ret=H5Pget_filter_by_id2(dcpl1,H5Z_FILTER_DEFLATE,&flags,NULL,NULL,0,NULL,NULL);
+ } H5E_END_TRY;
+ if(ret >=0) {
+ H5_FAILED();
+ printf(" Line %d: Shouldn't have deleted filter!\n",__LINE__);
+ goto error;
+ } /* end if */
+
/* try to delete the deflate filter again */
H5E_BEGIN_TRY {
ret=H5Premove_filter(dcpl1,H5Z_FILTER_DEFLATE);