Skip to content
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

Fix iomsg allocation in save_npy #600

Merged
merged 2 commits into from
Dec 17, 2021
Merged

Fix iomsg allocation in save_npy #600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d7e177
Fix iomsg allocation
ivan-pi Dec 15, 2021
1974cb4
Test iomsg deallocated in save_npy
ivan-pi Dec 15, 2021
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
4 changes: 3 additions & 1 deletion src/stdlib_io_npy_save.fypp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,9 @@ contains
end if

if (present(iomsg)) then
iomsg = "Failed to write array to file '"//filename//"'"
if (stat /= 0) then
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not check for present(iomsg) .and. stat /= 0?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did that initially, but then decided to go with nested if's to avoid the .and..

iomsg = "Failed to write array to file '"//filename//"'"
end if
end if
end subroutine save_npy_${t1[0]}$${k1}$_${rank}$
#:endfor
Expand Down
24 changes: 23 additions & 1 deletion src/tests/io/test_npy.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ subroutine collect_npy(testsuite)
new_unittest("duplicate-descr", test_duplicate_descr, should_fail=.true.), &
new_unittest("missing-descr", test_missing_descr, should_fail=.true.), &
new_unittest("missing-fortran_order", test_missing_fortran_order, should_fail=.true.), &
new_unittest("missing-shape", test_missing_shape, should_fail=.true.) &
new_unittest("missing-shape", test_missing_shape, should_fail=.true.), &
new_unittest("iomsg-deallocated", test_iomsg_deallocated) &
]
end subroutine collect_npy

Expand Down Expand Up @@ -619,6 +620,27 @@ subroutine test_missing_shape(error)
call check(error, stat, msg)
end subroutine test_missing_shape

subroutine test_iomsg_deallocated(error)
!> Error handling
type(error_type), allocatable, intent(out) :: error

integer :: stat
character(len=:), allocatable :: msg

character(len=*), parameter :: filename = ".test-iomsg-deallocated.npy"
real(sp), allocatable :: input(:, :), output(:, :)

msg = "This message should be deallocated."

allocate(input(12, 5))
call random_number(input)
call save_npy(filename, input, stat, msg)
call delete_file(filename)

call check(error,.not. allocated(msg), "Message wrongly allocated.")

end subroutine

subroutine delete_file(filename)
character(len=*), intent(in) :: filename

Expand Down