diff options
| author | James Laird <jlaird@hdfgroup.org> | 2006-12-14 18:46:51 (GMT) |
|---|---|---|
| committer | James Laird <jlaird@hdfgroup.org> | 2006-12-14 18:46:51 (GMT) |
| commit | 57a786d9c0242b7c94d0b0a1c8519f9b906d194a (patch) | |
| tree | 90afd463a6ebde70a585061f80ee8ff30bfd419f /src/H5Distore.c | |
| parent | 481cfbe0e958ba72623803884f4c69179724582f (diff) | |
| download | hdf5-57a786d9c0242b7c94d0b0a1c8519f9b906d194a.zip hdf5-57a786d9c0242b7c94d0b0a1c8519f9b906d194a.tar.gz hdf5-57a786d9c0242b7c94d0b0a1c8519f9b906d194a.tar.bz2 | |
[svn-r13063] Cleaned up some memory issues when copying, in preparation for checking in
code to copy shared messages. Should be fewer memory leaks and fewer
"uninitialized memory reads."
Tested on kagiso, smirom, and Windows.
Diffstat (limited to 'src/H5Distore.c')
| -rw-r--r-- | src/H5Distore.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/H5Distore.c b/src/H5Distore.c index dc39802..27b2577 100644 --- a/src/H5Distore.c +++ b/src/H5Distore.c @@ -3579,6 +3579,10 @@ H5D_istore_copy(H5F_t *f_src, H5O_layout_t *layout_src, H5F_t *f_dst, HDassert(layout_dst && H5D_CHUNKED == layout_dst->type); HDassert(dt_src); + /* Create datatype ID for src datatype */ + if((tid_src = H5I_register(H5I_DATATYPE, dt_src)) < 0) + HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to register source file datatype") + /* Create shared B-tree info for each file */ if(H5D_istore_shared_create(f_src, layout_src) < 0) HGOTO_ERROR(H5E_RESOURCE, H5E_CANTINIT, FAIL, "can't create wrapper for shared B-tree info") @@ -3602,10 +3606,6 @@ H5D_istore_copy(H5F_t *f_src, H5O_layout_t *layout_src, H5F_t *f_dst, hsize_t buf_dim; /* Dimension for buffer */ unsigned u; - /* Create datatype ID for src datatype */ - if((tid_src = H5I_register(H5I_DATATYPE, dt_src)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to register source file datatype") - /* create a memory copy of the variable-length datatype */ if(NULL == (dt_mem = H5T_copy(dt_src, H5T_COPY_TRANSIENT))) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to copy") @@ -3664,12 +3664,7 @@ H5D_istore_copy(H5F_t *f_src, H5O_layout_t *layout_src, H5F_t *f_dst, do_convert = TRUE; } /* end if */ else { - /* Create datatype ID for source datatype, so it gets freed */ if(H5T_get_class(dt_src, FALSE) == H5T_REFERENCE) { - /* Create datatype ID for src datatype */ - if((tid_src = H5I_register(H5I_DATATYPE, dt_src)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to register source file datatype") - /* Indicate that type conversion should be performed */ do_convert = TRUE; } /* end if */ |