diff options
| author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2013-02-18 00:46:21 (GMT) |
|---|---|---|
| committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2013-02-18 00:46:21 (GMT) |
| commit | c3fe96625111e4141ca2f82733a22d43ef757595 (patch) | |
| tree | bf49cd7e67dedf4c6499182a74ab433a98c34ab1 /hl/test/test_ds.c | |
| parent | dd422291e05c2e1deb2797dec6374d8cc521b0ca (diff) | |
| download | hdf5-c3fe96625111e4141ca2f82733a22d43ef757595.zip hdf5-c3fe96625111e4141ca2f82733a22d43ef757595.tar.gz hdf5-c3fe96625111e4141ca2f82733a22d43ef757595.tar.bz2 | |
[svn-r23291] brought r23241 into the branch.
Fix for: HDFFV-7596
H5DSget_scale returns size that includes NULL termination and H5DSget_label returns size NOT including NULL termination
Diffstat (limited to 'hl/test/test_ds.c')
| -rw-r--r-- | hl/test/test_ds.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hl/test/test_ds.c b/hl/test/test_ds.c index 149a0fd..1490f56 100644 --- a/hl/test/test_ds.c +++ b/hl/test/test_ds.c @@ -1127,9 +1127,9 @@ herr_t test_cmp_scalename(hid_t fid, hid_t did, const char *name, const char *sc if((dsid = H5Dopen2(fid, name, H5P_DEFAULT)) >= 0) { if(H5DSis_attached(did, dsid, idx) == 1) { if((name_len=H5DSget_scale_name(dsid,NULL,(size_t)0)) > 0) { - name_out = (char*)HDmalloc(name_len * sizeof (char)); + name_out = (char*)HDmalloc((name_len+1) * sizeof (char)); if(name_out != NULL) { - if(H5DSget_scale_name(dsid, name_out, (size_t)name_len) >= 0) { + if(H5DSget_scale_name(dsid, name_out, (size_t)name_len+1) >= 0) { if(HDstrcmp(scalename,name_out)==0) { ret_value = SUCCEED; } @@ -3240,12 +3240,12 @@ static int test_simple(void) goto out; /* allocate a buffer */ - name_out = (char*)HDmalloc(name_len * sizeof (char)); + name_out = (char*)HDmalloc((name_len+1) * sizeof (char)); if(name_out == NULL) goto out; /* get the scale name using this buffer */ - if(H5DSget_scale_name(dsid, name_out, (size_t)name_len) < 0) + if(H5DSget_scale_name(dsid, name_out, (size_t)name_len+1) < 0) goto out; if(HDstrcmp("Latitude set 0",name_out)!=0) |