summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2004-11-30 20:53:53 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2004-11-30 20:53:53 (GMT)
commit17daa748fa7458db8ea98593e21e8ebb123ce68e (patch)
treec965fbb64b7b84cfa57c5af02af47b6a80d9993e
parent5d104d60c92428c8460673591ff07437d44a8a36 (diff)
downloadhdf5-17daa748fa7458db8ea98593e21e8ebb123ce68e.zip
hdf5-17daa748fa7458db8ea98593e21e8ebb123ce68e.tar.gz
hdf5-17daa748fa7458db8ea98593e21e8ebb123ce68e.tar.bz2
[svn-r9603] Purpose:
Bug fix Description: Correct integer overflow situation for computing the size of a dataset. Solution: Rachet one of the dimensions down far enough that the total size of the dataset's raw data doesn't overflow a 64-bit int. Platforms tested: FreeBSD 4.10 (sleipnir) IRIX 6.? (tesla) w/-n32 Too minor to require h5committest
-rw-r--r--test/gen_old_layout.c2
-rw-r--r--test/tlayouto.h5bin1576 -> 1576 bytes
-rw-r--r--test/tmisc.c2
3 files changed, 2 insertions, 2 deletions
diff --git a/test/gen_old_layout.c b/test/gen_old_layout.c
index 473b3d3..46bbdaf 100644
--- a/test/gen_old_layout.c
+++ b/test/gen_old_layout.c
@@ -33,7 +33,7 @@
#define TESTFILE "tlayouto.h5"
#define SPACE_RANK 2
#define SPACE_DIM0 (8*1024*1024*1024ULL)
-#define SPACE_DIM1 ((4*1024*1024*1024ULL)+1ULL)
+#define SPACE_DIM1 ((256*1024*1024ULL)+1ULL)
/*-------------------------------------------------------------------------
diff --git a/test/tlayouto.h5 b/test/tlayouto.h5
index 5dba556..a038e68 100644
--- a/test/tlayouto.h5
+++ b/test/tlayouto.h5
Binary files differ
diff --git a/test/tmisc.c b/test/tmisc.c
index 3447b82..e4bff08 100644
--- a/test/tmisc.c
+++ b/test/tmisc.c
@@ -230,7 +230,7 @@ unsigned m13_rdata[MISC13_DIM1][MISC13_DIM2]; /* Data read from dataset
#define MISC20_DSET2_NAME "Dataset2"
#define MISC20_SPACE_RANK 2
#define MISC20_SPACE_DIM0 (8*1024*1024*(uint64_t)1024)
-#define MISC20_SPACE_DIM1 ((4*1024*1024*(uint64_t)1024)+1)
+#define MISC20_SPACE_DIM1 ((256*1024*(uint64_t)1024)+1)
#define MISC20_SPACE2_DIM0 8
#define MISC20_SPACE2_DIM1 4