diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-01-22 18:14:05 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-01-22 18:14:05 (GMT) |
| commit | 643b662d87cc7771b624a1c520d4775fdf225dec (patch) | |
| tree | 713b7d9cad96d7fa1cc7d6b76a8dd10014934ee1 /src/H5FDsec2.c | |
| parent | 65bc4bb9804471fe920bf25608ecea71b5b2d078 (diff) | |
| download | hdf5-643b662d87cc7771b624a1c520d4775fdf225dec.zip hdf5-643b662d87cc7771b624a1c520d4775fdf225dec.tar.gz hdf5-643b662d87cc7771b624a1c520d4775fdf225dec.tar.bz2 | |
[svn-r26003] merge 26002 from trunk:
move checks on reading/writing beyond file eoa outside of the file drivers and into a centralized place in H5FD_read/write.
tested with h5commitest
Diffstat (limited to 'src/H5FDsec2.c')
| -rw-r--r-- | src/H5FDsec2.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/H5FDsec2.c b/src/H5FDsec2.c index 952389e..a21fff8 100644 --- a/src/H5FDsec2.c +++ b/src/H5FDsec2.c @@ -687,9 +687,6 @@ H5FD_sec2_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "addr undefined, addr = %llu", (unsigned long long)addr) if(REGION_OVERFLOW(addr, size)) HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "addr overflow, addr = %llu", (unsigned long long)addr) - if((addr + size) > file->eoa) - HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "addr overflow, addr = %llu, size=%lu, eoa=%llu", - (unsigned long long)addr, size, (unsigned long long)file->eoa) /* Seek to the correct location */ if(addr != file->pos || OP_READ != file->op) { @@ -785,8 +782,6 @@ H5FD_sec2_write(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "addr undefined, addr = %llu", (unsigned long long)addr) if(REGION_OVERFLOW(addr, size)) HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "addr overflow, addr = %llu, size = %llu", (unsigned long long)addr, (unsigned long long)size) - if((addr + size) > file->eoa) - HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "addr overflow, addr = %llu, size = %llu, eoa = %llu", (unsigned long long)addr, (unsigned long long)size, (unsigned long long)file->eoa) /* Seek to the correct location */ if(addr != file->pos || OP_WRITE != file->op) { |