diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-27 22:15:14 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-27 22:15:14 (GMT) |
| commit | b9ca2f8f6f045b4a4d08b4412910c65966e42616 (patch) | |
| tree | fae192480a7479bee052e6d996e6654046480a1b /src/H5Oalloc.c | |
| parent | 6c5e42a96720ccd4c7b517af8c00c658112dc7af (diff) | |
| download | hdf5-b9ca2f8f6f045b4a4d08b4412910c65966e42616.zip hdf5-b9ca2f8f6f045b4a4d08b4412910c65966e42616.tar.gz hdf5-b9ca2f8f6f045b4a4d08b4412910c65966e42616.tar.bz2 | |
[svn-r18650] Description:
Bring back various minor tweaks & cleanups from the revise_chunks
branch.
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, in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in debug mode
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
Diffstat (limited to 'src/H5Oalloc.c')
| -rw-r--r-- | src/H5Oalloc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/H5Oalloc.c b/src/H5Oalloc.c index 6b921f2..64d2f03 100644 --- a/src/H5Oalloc.c +++ b/src/H5Oalloc.c @@ -1128,7 +1128,10 @@ H5O_alloc(H5F_t *f, hid_t dxpl_id, H5O_t *oh, const H5O_msg_class_t *type, HDassert(mesg); /* Compute the size needed to store the message in the object header */ - if((raw_size = (type->raw_size)(f, FALSE, mesg)) >= H5O_MESG_MAX_SIZE) + raw_size = (type->raw_size)(f, FALSE, mesg); + if(0 == raw_size) + HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "can't compute object header message size") + if(raw_size >= H5O_MESG_MAX_SIZE) HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "object header message is too large") aligned_size = H5O_ALIGN_OH(oh, raw_size); |