diff options
author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2012-03-22 14:51:11 (GMT) |
---|---|---|
committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2012-03-22 14:51:11 (GMT) |
commit | 77a3e8e5c9401e2c7872d850d8d03a1947775f29 (patch) | |
tree | 3a72d2fac766688fb8fcf908366af6e6f0d5b73f /test/fheap.c | |
parent | d17a7fa26e972714082c5061f29f6b9335e189f4 (diff) | |
parent | 0d2f2074cb64114fdd8aea5164e114d08d621f1b (diff) | |
download | hdf5-77a3e8e5c9401e2c7872d850d8d03a1947775f29.zip hdf5-77a3e8e5c9401e2c7872d850d8d03a1947775f29.tar.gz hdf5-77a3e8e5c9401e2c7872d850d8d03a1947775f29.tar.bz2 |
[svn-r22120] merge from trunk
Diffstat (limited to 'test/fheap.c')
-rw-r--r-- | test/fheap.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/test/fheap.c b/test/fheap.c index f2960a3..b55c60b 100644 --- a/test/fheap.c +++ b/test/fheap.c @@ -415,13 +415,20 @@ add_obj(H5HF_t *fh, hid_t dxpl, size_t obj_off, if(keep_ids) { /* Check for needing to increase size of heap ID array */ if(keep_ids->num_ids + 1 > keep_ids->alloc_ids) { + unsigned char *tmp_ids; + size_t *tmp_lens; + size_t *tmp_offs; + keep_ids->alloc_ids = MAX(1024, (keep_ids->alloc_ids * 2)); - if(NULL == (keep_ids->ids = (unsigned char *)H5MM_realloc(keep_ids->ids, id_len * keep_ids->alloc_ids))) + if(NULL == (tmp_ids = (unsigned char *)H5MM_realloc(keep_ids->ids, id_len * keep_ids->alloc_ids))) TEST_ERROR - if(NULL == (keep_ids->lens = (size_t *)H5MM_realloc(keep_ids->lens, sizeof(size_t) * keep_ids->alloc_ids))) + keep_ids->ids = tmp_ids; + if(NULL == (tmp_lens = (size_t *)H5MM_realloc(keep_ids->lens, sizeof(size_t) * keep_ids->alloc_ids))) TEST_ERROR - if(NULL == (keep_ids->offs = (size_t *)H5MM_realloc(keep_ids->offs, sizeof(size_t) * keep_ids->alloc_ids))) + keep_ids->lens = tmp_lens; + if(NULL == (tmp_offs = (size_t *)H5MM_realloc(keep_ids->offs, sizeof(size_t) * keep_ids->alloc_ids))) TEST_ERROR + keep_ids->offs = tmp_offs; } /* end if */ /* Append the object info onto the array */ |