summaryrefslogtreecommitdiffstats
path: root/test/th5s.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2010-01-23 04:53:22 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2010-01-23 04:53:22 (GMT)
commitab37aae39f7754827774577a0053e1b0979b3b1d (patch)
treef5b018adbd378048d6a8112ab94f873eeb5dddb1 /test/th5s.c
parente8538794ef18febaa471a2a81639c9a9ef7bfba1 (diff)
downloadhdf5-ab37aae39f7754827774577a0053e1b0979b3b1d.zip
hdf5-ab37aae39f7754827774577a0053e1b0979b3b1d.tar.gz
hdf5-ab37aae39f7754827774577a0053e1b0979b3b1d.tar.bz2
[svn-r18158] Description:
Bring r18157 from trunk to 1.8 branch: Bring back changes from Coverity session on 1/15/10: r18111: Fix Coverity issue #130: make certain that the cache gets freed on error. r18112: Fix Coverity issue #43 by making cache testing calls protected by 'pass' variable. r18113: Fix Coverity issue #129 by releasing the cache on error. r18115: Coverity #45 fix: patched an error check in H5Screate_simple to prevent future dereferencing of a NULL point. Added a verification in test/th5s.c. r18116: Fix Coverity issue #43 by releasing cache on error. r18117: Coverity #362,363 by adding HGOTO_DONE, freeing allocations and associated changes. REsolving coverity results #364-368, 369, 370-372, 377, 379, and 380. r18118: Fix Coverity issue #42: assert that cache & test specification pointer are valid. r18122: Coverity #362,363 by adding HGOTO_DONE and freeing allocations. This also takes care of #357,358. r18123: Coverity #359-361, 373-376: Added HGOTO_DONE(FAIL) statement after checking allocation for NULL. Verified allocation is freed in done block. r18128: Fixed coverity issue #10 -- removed dead code. Tested on: Mac OS X/32 10.6.2 (amazon)
Diffstat (limited to 'test/th5s.c')
-rw-r--r--test/th5s.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/test/th5s.c b/test/th5s.c
index e21dee2..a38e384 100644
--- a/test/th5s.c
+++ b/test/th5s.c
@@ -699,11 +699,11 @@ test_h5s_scalar_write(void)
{
hid_t fid1; /* HDF5 File IDs */
hid_t dataset; /* Dataset ID */
- hid_t sid1; /* Dataspace ID */
+ hid_t sid1; /* Dataspace ID */
int rank; /* Logical rank of dataspace */
hsize_t tdims[4]; /* Dimension array to test with */
hssize_t n; /* Number of dataspace elements */
- H5S_class_t ext_type; /* Extent type */
+ H5S_class_t ext_type; /* Extent type */
herr_t ret; /* Generic return value */
/* Output message about test being performed */
@@ -713,6 +713,12 @@ test_h5s_scalar_write(void)
fid1 = H5Fcreate(DATAFILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
CHECK(fid1, FAIL, "H5Fcreate");
+ /* Verify a non-zero rank fails with a NULL dimension. */
+ H5E_BEGIN_TRY {
+ sid1 = H5Screate_simple(SPACE1_RANK, NULL, NULL);
+ } H5E_END_TRY
+ VERIFY(sid1, FAIL, "H5Screate_simple");
+
/* Create scalar dataspace */
sid1 = H5Screate_simple(SPACE3_RANK, NULL, NULL);
CHECK(sid1, FAIL, "H5Screate_simple");