summaryrefslogtreecommitdiffstats
path: root/hl/src
diff options
context:
space:
mode:
authorScot Breitenfeld <brtnfld@hdfgroup.org>2012-07-27 02:51:04 (GMT)
committerScot Breitenfeld <brtnfld@hdfgroup.org>2012-07-27 02:51:04 (GMT)
commitf385b0d537b4fd5fec2e67b93e15c7c3a764c4a3 (patch)
tree60c6e548cf02bd9eec9de6bd286f0f9539687ec4 /hl/src
parent7143164de9d7de52516697bbb6bfc7cd2cf749d6 (diff)
downloadhdf5-f385b0d537b4fd5fec2e67b93e15c7c3a764c4a3.zip
hdf5-f385b0d537b4fd5fec2e67b93e15c7c3a764c4a3.tar.gz
hdf5-f385b0d537b4fd5fec2e67b93e15c7c3a764c4a3.tar.bz2
[svn-r22610] HDFFV-8055 H5TBdelete_record destroys data after the deleted row
Added fix and test case. Tested: gnu and intel (jam)
Diffstat (limited to 'hl/src')
-rw-r--r--hl/src/H5TB.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/hl/src/H5TB.c b/hl/src/H5TB.c
index 6edc244..8a77f13 100644
--- a/hl/src/H5TB.c
+++ b/hl/src/H5TB.c
@@ -1298,6 +1298,7 @@ herr_t H5TBdelete_record( hid_t loc_id,
hid_t tid=-1;
hid_t sid=-1;
hid_t m_sid=-1;
+ hid_t mem_type_id=-1;
hsize_t count[1];
hsize_t offset[1];
hsize_t mem_size[1];
@@ -1364,6 +1365,10 @@ herr_t H5TBdelete_record( hid_t loc_id,
if ((sid = H5Dget_space( did )) < 0)
goto out;
+ /* create the memory data type. */
+ if ((mem_type_id=H5TB_create_type( loc_id, dset_name, src_size, src_offset, src_sizes, tid)) < 0)
+ goto out;
+
/* define a hyperslab in the dataset of the size of the records */
offset[0] = start;
count[0] = read_nrecords;
@@ -1375,12 +1380,14 @@ herr_t H5TBdelete_record( hid_t loc_id,
if ((m_sid = H5Screate_simple( 1, mem_size, NULL )) < 0)
goto out;
- if (H5Dwrite( did, tid, m_sid, sid, H5P_DEFAULT, tmp_buf ) < 0)
+ if (H5Dwrite( did, mem_type_id, m_sid, sid, H5P_DEFAULT, tmp_buf ) < 0)
goto out;
/* close */
if (H5Sclose( m_sid ) < 0)
goto out;
+ if (H5Tclose( mem_type_id ) < 0)
+ goto out;
if (H5Sclose( sid ) < 0)
goto out;
if (H5Tclose( tid ) < 0)
@@ -1416,6 +1423,7 @@ out:
free( tmp_buf );
H5E_BEGIN_TRY
{
+ H5Tclose(mem_type_id);
H5Dclose(did);
H5Tclose(tid);
H5Sclose(sid);