diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 1999-09-29 00:30:21 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 1999-09-29 00:30:21 (GMT) |
| commit | 4d5186a245fa6f86efbbb77a2b640b1369dd58f5 (patch) | |
| tree | 38398a047a439c83c063a5c813e653f8eefb966b /src/H5Tconv.c | |
| parent | dd266011176b9003e38aa9ff55a6557a6e2e53c4 (diff) | |
| download | hdf5-4d5186a245fa6f86efbbb77a2b640b1369dd58f5.zip hdf5-4d5186a245fa6f86efbbb77a2b640b1369dd58f5.tar.gz hdf5-4d5186a245fa6f86efbbb77a2b640b1369dd58f5.tar.bz2 | |
[svn-r1689] Mainly adding support for "native" variable-length strings (C only currently),
but I fixed lots of misc. compiler warnings in other code and also tracked down
the memory overwrite bug that was causing the development branch to core dump
on most machines.
Diffstat (limited to 'src/H5Tconv.c')
| -rw-r--r-- | src/H5Tconv.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/H5Tconv.c b/src/H5Tconv.c index 0b43fbe..2540204 100644 --- a/src/H5Tconv.c +++ b/src/H5Tconv.c @@ -1766,7 +1766,7 @@ H5T_conv_vlen(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, uint8_t *s, *sp, *d, *dp; /*source and dest traversal ptrs */ uint8_t **dptr; /*pointer to correct destination pointer*/ size_t src_delta, dst_delta; /*source & destination stride */ - hsize_t seq_len; /*the number of elements in the current sequence*/ + hssize_t seq_len; /*the number of elements in the current sequence*/ size_t src_base_size, dst_base_size;/*source & destination base size*/ size_t src_size, dst_size;/*source & destination total size in bytes*/ hid_t conv_buf_id; /*ID for comversion buffer */ @@ -1885,6 +1885,7 @@ H5T_conv_vlen(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, /* Get length of sequences in bytes */ seq_len=(*(src->u.vlen.getlen))(src->u.vlen.f,s); + assert(seq_len>=0); src_size=seq_len*src_base_size; dst_size=seq_len*dst_base_size; |