diff options
| author | Neil Fortner <nfortne2@hdfgroup.org> | 2009-10-02 20:40:01 (GMT) |
|---|---|---|
| committer | Neil Fortner <nfortne2@hdfgroup.org> | 2009-10-02 20:40:01 (GMT) |
| commit | eed2ea424b233c451c81569aa2df48c99bc8c79e (patch) | |
| tree | a555761e54042fe829b05539874d081fc4fa76d8 /src/H5Dcontig.c | |
| parent | c53e577d1485c4d3e1985c3b7fb38a67fa42ec3f (diff) | |
| download | hdf5-eed2ea424b233c451c81569aa2df48c99bc8c79e.zip hdf5-eed2ea424b233c451c81569aa2df48c99bc8c79e.tar.gz hdf5-eed2ea424b233c451c81569aa2df48c99bc8c79e.tar.bz2 | |
[svn-r17585] Purpose: Fix bug 1597
Description:
When copying a dataset using a vlen inside a compound, the various dataset
copying callbacks would allocate a background buffer but would not use it when
converting from disk to memory, only memory to disk. This caused an assertion
failure as compounds always need a background buffer. These callbacks have
been modified to use the background buffer for both conversions.
Tested: jam, linew, smirom (h5committest)
Diffstat (limited to 'src/H5Dcontig.c')
| -rw-r--r-- | src/H5Dcontig.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/H5Dcontig.c b/src/H5Dcontig.c index 0ff3964..3e88be6 100644 --- a/src/H5Dcontig.c +++ b/src/H5Dcontig.c @@ -1396,7 +1396,7 @@ H5D_contig_copy(H5F_t *f_src, const H5O_storage_contig_t *storage_src, /* Perform datatype conversion, if necessary */ if(is_vlen) { /* Convert from source file to memory */ - if(H5T_convert(tpath_src_mem, tid_src, tid_mem, nelmts, (size_t)0, (size_t)0, buf, NULL, dxpl_id) < 0) + if(H5T_convert(tpath_src_mem, tid_src, tid_mem, nelmts, (size_t)0, (size_t)0, buf, bkg, dxpl_id) < 0) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "datatype conversion failed") /* Copy into another buffer, to reclaim memory later */ |