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/H5FDlog.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/H5FDlog.c')
-rw-r--r-- | src/H5FDlog.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/H5FDlog.c b/src/H5FDlog.c index 0e66da0..135b901 100644 --- a/src/H5FDlog.c +++ b/src/H5FDlog.c @@ -1122,8 +1122,6 @@ H5FD_log_read(H5FD_t *_file, H5FD_mem_t type, hid_t UNUSED dxpl_id, haddr_t addr 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", (unsigned long long)addr) /* Log the I/O information about the read */ if(file->fa.flags != 0) { @@ -1328,8 +1326,6 @@ H5FD_log_write(H5FD_t *_file, H5FD_mem_t type, hid_t UNUSED dxpl_id, haddr_t add 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) /* Log the I/O information about the write */ if(file->fa.flags & H5FD_LOG_FILE_WRITE) { |