Skip to content

[flang] Fix crash exposed by fuzzing #122187

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

Merged
merged 1 commit into from
Jan 14, 2025
Merged

[flang] Fix crash exposed by fuzzing #122187

Show file tree
Hide file tree
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
16 changes: 11 additions & 5 deletions flang/lib/Evaluate/intrinsics.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2094,7 +2094,7 @@ std::optional<SpecificCall> IntrinsicInterface::Match(
const ActualArgument *arrayArg{nullptr};
const char *arrayArgName{nullptr};
const ActualArgument *knownArg{nullptr};
std::optional<int> shapeArgSize;
std::optional<std::int64_t> shapeArgSize;
int elementalRank{0};
for (std::size_t j{0}; j < dummies; ++j) {
const IntrinsicDummyArgument &d{dummy[std::min(j, dummyArgPatterns - 1)]};
Expand Down Expand Up @@ -2133,14 +2133,20 @@ std::optional<SpecificCall> IntrinsicInterface::Match(
if (auto shape{GetShape(context, *arg)}) {
if (auto constShape{AsConstantShape(context, *shape)}) {
shapeArgSize = constShape->At(ConstantSubscripts{1}).ToInt64();
CHECK(*shapeArgSize >= 0);
argOk = true;
CHECK(shapeArgSize.value() >= 0);
argOk = *shapeArgSize <= common::maxRank;
}
}
}
if (!argOk) {
messages.Say(arg->sourceLocation(),
"'shape=' argument must be a vector of known size"_err_en_US);
if (shapeArgSize.value_or(0) > common::maxRank) {
messages.Say(arg->sourceLocation(),
"'shape=' argument must be a vector of at most %d elements (has %jd)"_err_en_US,
common::maxRank, std::intmax_t{*shapeArgSize});
} else {
messages.Say(arg->sourceLocation(),
"'shape=' argument must be a vector of known size"_err_en_US);
}
return std::nullopt;
}
break;
Expand Down
3 changes: 1 addition & 2 deletions flang/test/Semantics/reshape.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,9 @@ program reshaper
!ERROR: 'shape=' argument has too many elements
integer :: array23(I64_MAX, I64_MAX) = RESHAPE([1, 2, 3], huge_shape)

!ERROR: Size of 'shape=' argument must not be greater than 15
CALL ext_sub(RESHAPE([(n, n=1,20)], &
!ERROR: 'shape=' argument must be a vector of at most 15 elements (has 16)
[1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]))
!ERROR: Reference to the procedure 'ext_sub' has an implicit interface that is distinct from another reference: incompatible dummy argument #1: incompatible dummy data object shapes
!ERROR: 'shape=' argument must not have a negative extent
CALL ext_sub(RESHAPE([(n, n=1,20)], [1, -5, 3]))
!ERROR: 'order=' argument has unacceptable rank 2
Expand Down
Loading