summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2003-10-10 14:55:58 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2003-10-10 14:55:58 (GMT)
commita310180c7f3075febfc177e4da307fe304b8f370 (patch)
treef42864683368c0e61d6c15bdd40cc9d7440332ab
parent9ef846aef1ac23f6979a076d61f6ba7dda31ec42 (diff)
downloadhdf5-a310180c7f3075febfc177e4da307fe304b8f370.zip
hdf5-a310180c7f3075febfc177e4da307fe304b8f370.tar.gz
hdf5-a310180c7f3075febfc177e4da307fe304b8f370.tar.bz2
[svn-r7591] Purpose:
Bug fix Description: Correct the size of the buffer needed for the destination value to use the actual destination type size. Platforms tested: FreeBSD 4.9 (sleipnir) too minor to require h5committest
-rw-r--r--src/H5Tconv.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/H5Tconv.c b/src/H5Tconv.c
index 9c5045a..5695b08 100644
--- a/src/H5Tconv.c
+++ b/src/H5Tconv.c
@@ -2155,7 +2155,6 @@ H5T_conv_vlen(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts,
void *tmp_buf=NULL; /*temporary background buffer */
size_t tmp_buf_size=0; /*size of temporary bkg buffer */
void *dbuf=NULL; /*temp destination buffer */
- size_t dbuf_size=0; /*size of destination buffer */
int direction; /*direction of traversal */
int nested=0; /*flag of nested VL case */
hsize_t elmtno; /*element number counter */
@@ -2235,8 +2234,7 @@ H5T_conv_vlen(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts,
bkg_delta = direction * (bkg_stride ? bkg_stride : dst->size);
/* Dynamically allocate the destination buffer */
- dbuf_size=MAX(sizeof(hvl_t),sizeof(char *));
- if ((dbuf=H5FL_BLK_MALLOC(vlen_seq,dbuf_size))==NULL)
+ if ((dbuf=H5FL_BLK_MALLOC(vlen_seq,dst->size))==NULL)
HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for type conversion");
/*