Skip to content

Range check mask_table entries before writing maskmap #1920

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
arpitjain099 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Range check mask_table entries before writing maskmap #1920

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions fms2_io/fms_io_utils.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,6 +626,12 @@ subroutine parse_mask_table_2d(mask_table, maskmap, modelname)

call mpp_broadcast(mask_list, 2*nmask, mpp_root_pe())
do n = 1, nmask
!--- the indices come from the file and nothing above checked them
if (mask_list(n,1) < 1 .or. mask_list(n,1) > size(maskmap,1) .or. &
mask_list(n,2) < 1 .or. mask_list(n,2) > size(maskmap,2)) then
call mpp_error(FATAL, "fms2_io(parse_mask_table_2d): mask_list entry is outside "// &
"the layout in file "//trim(mask_table))
endif
maskmap(mask_list(n,1),mask_list(n,2)) = .false.
enddo

Expand Down Expand Up @@ -731,6 +737,13 @@ subroutine parse_mask_table_3d(mask_table, maskmap, modelname)

call mpp_broadcast(mask_list, 3*nmask, mpp_root_pe())
do n = 1, nmask
!--- as above, the indices are file-supplied and unchecked
if (mask_list(n,1) < 1 .or. mask_list(n,1) > size(maskmap,1) .or. &
mask_list(n,2) < 1 .or. mask_list(n,2) > size(maskmap,2) .or. &
mask_list(n,3) < 1 .or. mask_list(n,3) > size(maskmap,3)) then
call mpp_error(FATAL, "fms2_io(parse_mask_table_3d): mask_list entry is outside "// &
"the layout in file "//trim(mask_table))
endif
maskmap(mask_list(n,1),mask_list(n,2),mask_list(n,3)) = .false.
enddo
deallocate(mask_list, mask_table_contents)
Expand Down