mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-03-19 16:50:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r20513] Description:

Browse Source 
Correct several problems with compound datatypes that don't have any
fields added:

- Change assertion to error report when a file is encountered which has this
	situation.

- Added check to attribute creation to avoid creating attributes with a
	datatype like this (datasets and named datatypes already have the check)

Tested on:
        FreeBSD/32 6.3 (duty) in debug mode
        FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
                w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x,
                w/C++ & FORTRAN, in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                w/szip filter, w/threadsafe, in production mode
        Linux/PPC 2.6 (heiwa) w/C++ & FORTRAN, w/threadsafe, in debug mode
This commit is contained in:
Quincey Koziol 2011-04-15 14:06:38 -05:00
parent 39deb10f4a
commit 427add7c92
6 changed files with 228 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MANIFEST
View File

@ -809,6 +809,7 @@
./test/Makefile.in
./test/accum.c
./test/app_ref.c
./test/bad_compound.h5
./test/be_data.h5
./test/be_extlink1.h5
./test/be_extlink2.h5
@ -852,6 +853,7 @@
./test/flush1.c
./test/flush2.c
./test/gen_bad_ohdr.c _DO_NOT_DISTRIBUTE_
./test/gen_bad_compound.c _DO_NOT_DISTRIBUTE_
./test/gen_bogus.c _DO_NOT_DISTRIBUTE_
./test/gen_cross.c _DO_NOT_DISTRIBUTE_
./test/gen_deflate.c _DO_NOT_DISTRIBUTE_

10
src/H5A.c
View File

@ -389,14 +389,18 @@ H5A_create(const H5G_loc_t *loc, const char *name, const H5T_t *type,
/* Check if the dataspace has an extent set (or is NULL) */
if(!(H5S_has_extent(space)))
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "dataspace extent has not been set")
HGOTO_ERROR(H5E_ATTR, H5E_BADVALUE, FAIL, "dataspace extent has not been set")
/* Check if the datatype is "sensible" for use in a dataset */
if(H5T_is_sensible(type) != TRUE)
HGOTO_ERROR(H5E_ATTR, H5E_BADTYPE, FAIL, "datatype is not sensible")
/* Build the attribute information */
if(NULL == (attr = H5FL_CALLOC(H5A_t)))
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for attribute info")
HGOTO_ERROR(H5E_ATTR, H5E_CANTALLOC, FAIL, "memory allocation failed for attribute info")
if(NULL == (attr->shared = H5FL_CALLOC(H5A_shared_t)))
HGOTO_ERROR(H5E_FILE, H5E_NOSPACE, FAIL, "can't allocate shared attr structure")
HGOTO_ERROR(H5E_ATTR, H5E_CANTALLOC, FAIL, "can't allocate shared attr structure")
/* If the creation property list is H5P_DEFAULT, use the default character encoding */
if(acpl_id == H5P_DEFAULT)

5
src/H5Odtype.c
View File

@ -268,12 +268,13 @@ H5O_dtype_decode_helper(H5F_t *f, unsigned *ioflags/*in,out*/, const uint8_t **p
* Compound datatypes...
*/
dt->shared->u.compnd.nmembs = flags & 0xffff;
HDassert(dt->shared->u.compnd.nmembs > 0);
if(dt->shared->u.compnd.nmembs == 0)
HGOTO_ERROR(H5E_DATATYPE, H5E_BADVALUE, FAIL, "invalid number of members: %u", dt->shared->u.compnd.nmembs)
dt->shared->u.compnd.nalloc = dt->shared->u.compnd.nmembs;
dt->shared->u.compnd.memb = (H5T_cmemb_t *)H5MM_calloc(dt->shared->u.compnd.nalloc * sizeof(H5T_cmemb_t));
dt->shared->u.compnd.memb_size = 0;
if(NULL == dt->shared->u.compnd.memb)
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTALLOC, FAIL, "memory allocation failed")
for(i = 0; i < dt->shared->u.compnd.nmembs; i++) {
unsigned ndims = 0; /* Number of dimensions of the array field */
htri_t can_upgrade; /* Whether we can upgrade this type's version */

BIN
test/bad_compound.h5 Normal file
View File

Binary file not shown.

130
test/dtypes.c
View File

@ -23,6 +23,7 @@
#include <math.h>
#include <time.h>
#include "h5test.h"
#include "H5srcdir.h"
#include "H5Iprivate.h" /* For checking that datatype id's don't leak */
/* Number of elements in each test */
@ -81,6 +82,8 @@ const char *FILENAME[] = {
NULL
};
#define TESTFILE "bad_compound.h5"
typedef struct complex_t {
double re;
double im;
@ -3124,6 +3127,132 @@ error:
return 1;
} /* end test_compound_17() */
/*-------------------------------------------------------------------------
* Function: test_compound_18
*
* Purpose: Tests that library fails correctly when opening a dataset
* a compound datatype with zero fields.
*
* Return: Success: 0
* Failure: number of errors
*
* Programmer: Quincey Koziol
* Thursday, April 14, 2011
*
*-------------------------------------------------------------------------
*/
static int
test_compound_18(void)
{
hid_t file = -1;
hid_t gid = -1;
hid_t did = -1;
hid_t aid = -1;
hid_t tid = -1;
hid_t sid = -1;
hsize_t dim = 1;
const char *testfile = H5_get_srcdir_filename(TESTFILE); /* Corrected test file name */
char filename[1024];
herr_t ret;
TESTING("accessing objects with compound datatypes that have no fields");
/* Create compound datatype, but don't insert fields */
tid = H5Tcreate(H5T_COMPOUND, (size_t)8);
assert(tid > 0);
/* Attempt to create file with compound datatype that has no fields */
/* Create File */
h5_fixname(FILENAME[3], H5P_DEFAULT, filename, sizeof filename);
if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
/* Create a dataspace to use */
sid = H5Screate_simple(1, &dim, NULL);
assert(sid > 0);
/* Create a dataset with the bad compound datatype */
H5E_BEGIN_TRY {
did = H5Dcreate2(file, "dataset", tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
} H5E_END_TRY;
if(did > 0) {
H5Dclose(did);
FAIL_PUTS_ERROR("created dataset with bad compound datatype")
} /* end if */
/* Create a group */
gid = H5Gcreate2(file, "group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
assert(gid > 0);
/* Create an attribute with the bad compound datatype */
H5E_BEGIN_TRY {
aid = H5Acreate2(gid, "attr", tid, sid, H5P_DEFAULT, H5P_DEFAULT);
} H5E_END_TRY;
if(aid > 0) {
H5Aclose(aid);
FAIL_PUTS_ERROR("created attribute with bad compound datatype")
} /* end if */
/* Commit the datatype */
H5E_BEGIN_TRY {
ret = H5Tcommit2(file, "cmpnd", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
} H5E_END_TRY;
if(ret >= 0) {
FAIL_PUTS_ERROR("committed named datatype with bad compound datatype")
} /* end if */
/* Close IDs */
if(H5Tclose(tid) < 0) FAIL_STACK_ERROR
if(H5Sclose(sid) < 0) FAIL_STACK_ERROR
if(H5Gclose(gid) < 0) FAIL_STACK_ERROR
if(H5Fclose(file) < 0) FAIL_STACK_ERROR
/* Open Generated File */
/* (generated with gen_bad_compound.c) */
if((file = H5Fopen(testfile, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
/* Try to open the datatype */
H5E_BEGIN_TRY {
tid = H5Topen2(file, "cmpnd", H5P_DEFAULT);
} H5E_END_TRY;
if(tid > 0) {
H5Tclose(tid);
FAIL_PUTS_ERROR("opened named datatype with bad compound datatype")
} /* end if */
/* Try to open the dataset */
H5E_BEGIN_TRY {
did = H5Dopen2(file, "dataset", H5P_DEFAULT);
} H5E_END_TRY;
if(did > 0) {
H5Dclose(did);
FAIL_PUTS_ERROR("opened dataset with bad compound datatype")
} /* end if */
/* Open the group with the attribute */
if((gid = H5Gopen2(file, "group", H5P_DEFAULT)) < 0) TEST_ERROR
/* Try to open the dataset */
H5E_BEGIN_TRY {
aid = H5Aopen(gid, "attr", H5P_DEFAULT);
} H5E_END_TRY;
if(aid > 0) {
H5Aclose(aid);
FAIL_PUTS_ERROR("opened attribute with bad compound datatype")
} /* end if */
/* Close IDs */
if(H5Gclose(gid) < 0) FAIL_STACK_ERROR
if(H5Fclose(file) < 0) FAIL_STACK_ERROR
PASSED();
return 0;
error:
return 1;
} /* end test_compound_18() */
/*-------------------------------------------------------------------------
* Function: test_query
@ -6532,6 +6661,7 @@ main(void)
nerrors += test_compound_15();
nerrors += test_compound_16();
nerrors += test_compound_17();
nerrors += test_compound_18();
nerrors += test_conv_enum_1();
nerrors += test_conv_enum_2();
nerrors += test_conv_bitfield();

86
test/gen_bad_compound.c Normal file
View File

@ -0,0 +1,86 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Copyright by The HDF Group. *
* Copyright by the Board of Trustees of the University of Illinois. *
* All rights reserved. *
* *
* This file is part of HDF5. The full HDF5 copyright notice, including *
* terms governing use, modification, and redistribution, is contained in *
* the files COPYING and Copyright.html. COPYING can be found at the root *
* of the source code distribution tree; Copyright.html can be found at the *
* root level of an installed copy of the electronic HDF5 document set and *
* is linked from the top-level documents page. It can also be found at *
* http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have *
* access to either file, you may request a copy from help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/*
* Programmer: Quincey Koziol <koziol@hdfgroup.org>
* April 14, 2011
*
* Purpose: This program is run to generate an HDF5 data file with objects
* that use compound datatypes with no fields (now forbidden to
* be created by the library, as of v1.4.x). It must be built/run
* with a copy of the 1.2.x library.
*/
#include <assert.h>
#include "hdf5.h"
#define FILENAME "bad_compound.h5"
int main()
{
hid_t file;
hid_t cmpd_dt;
hid_t sid;
hid_t did;
hid_t aid;
hid_t gid;
hsize_t dim = 1;
herr_t ret;
/* Create compound datatype, but don't insert fields */
cmpd_dt = H5Tcreate(H5T_COMPOUND, (size_t)8);
assert(cmpd_dt > 0);
/* Create File */
file = H5Fcreate(FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
assert(file > 0);
/* Create a dataspace to use */
sid = H5Screate_simple(1, &dim, NULL);
assert(sid > 0);
/* Create a dataset with the bad compound datatype */
did = H5Dcreate(file, "dataset", cmpd_dt, sid, H5P_DEFAULT);
assert(did > 0);
/* Create a group */
gid = H5Gcreate(file, "group", (size_t)0);
assert(gid > 0);
/* Create an attribute with the bad compound datatype */
aid = H5Acreate(gid, "attr", cmpd_dt, sid, H5P_DEFAULT);
assert(aid > 0);
/* Commit the datatype */
ret = H5Tcommit(file, "cmpnd", cmpd_dt);
assert(ret >= 0);
/* Close IDs */
ret = H5Gclose(gid);
assert(ret >= 0);
ret = H5Aclose(aid);
assert(ret >= 0);
ret = H5Sclose(sid);
assert(ret >= 0);
ret = H5Dclose(did);
assert(ret >= 0);
ret = H5Tclose(cmpd_dt);
assert(ret >= 0);
ret = H5Fclose(file);
assert(ret >= 0);
return(0);
}