mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-02-17 16:10:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r5484]

Browse Source 
Purpose:
    Bug Fixing
Description:
    In H5FD_family_write and H5FD_family_read, size_t is checked against
    hsize_t for overflow, which fails on IA32 architecture machine supporting
    large files.
Solution:
    Use temporary variable which won't pass the limit of size_t.
Platforms tested:
    Linux 2.4(platinum) and IRIX64 6.5(modi4)
This commit is contained in:
Raymond Lu 2002-05-29 16:42:00 -05:00
parent 02350ea835
commit 1bf7cb7af1
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/H5FDfamily.c
View File

@ -864,9 +864,7 @@ H5FD_family_read(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, si
int i;
haddr_t sub;
size_t req;
#ifndef NDEBUG
hsize_t tempreq;
#endif /* NDEBUG */
H5P_genplist_t *plist; /* Property list pointer */
FUNC_ENTER_NOAPI(H5FD_family_read, FAIL);
@ -891,13 +889,13 @@ H5FD_family_read(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, si
sub = addr % file->memb_size;
#ifndef NDEBUG
/* This check is for mainly for IA32 architecture whose size_t's size
* is 4 bytes, to prevent overflow when user application is trying to
* write files bigger than 4GB. */
tempreq = file->memb_size-sub;
H5_CHECK_OVERFLOW(tempreq,hsize_t,size_t);
if(tempreq > SIZET_MAX)
tempreq = SIZET_MAX;
req = MIN(size, (size_t)tempreq);
#else /* NDEBUG */
req = MIN(size, (size_t)(file->memb_size-sub));
#endif /* NDEBUG */
assert(i<file->nmembs);
@ -942,9 +940,7 @@ H5FD_family_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, s
int i;
haddr_t sub;
size_t req;
#ifndef NDEBUG
hsize_t tempreq;
#endif /* NDEBUG */
H5P_genplist_t *plist; /* Property list pointer */
FUNC_ENTER_NOAPI(H5FD_family_write, FAIL);
@ -969,13 +965,13 @@ H5FD_family_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, s
sub = addr % file->memb_size;
#ifndef NDEBUG
/* This check is for mainly for IA32 architecture whose size_t's size
* is 4 bytes, to prevent overflow when user application is trying to
* write files bigger than 4GB. */
tempreq = file->memb_size-sub;
H5_CHECK_OVERFLOW(tempreq,hsize_t,size_t);
if(tempreq > SIZET_MAX)
tempreq = SIZET_MAX;
req = MIN(size, (size_t)tempreq);
#else /* NDEBUG */
req = MIN(size, (size_t)(file->memb_size-sub));
#endif /* NDEBUG */
assert(i<file->nmembs);