[flang-commits] [flang] bf23ae6 - [flang] Fix crash in fuzzed input program (#122193)

[via flang-commits]

Author: Peter Klausler
Date: 2025-01-14T10:39:51-08:00
New Revision: bf23ae6d38cfdda3284e8ddb3a296ad44c001a8a

URL: https://github.com/llvm/llvm-project/commit/bf23ae6d38cfdda3284e8ddb3a296ad44c001a8a
DIFF: https://github.com/llvm/llvm-project/commit/bf23ae6d38cfdda3284e8ddb3a296ad44c001a8a.diff

LOG: [flang] Fix crash in fuzzed input program (#122193)

Fixes https://github.com/llvm/llvm-project/issues/121971.

Added: 
    flang/test/Semantics/bug121971.f90

Modified: 
    flang/lib/Evaluate/shape.cpp

Removed: 
    


################################################################################
diff  --git a/flang/lib/Evaluate/shape.cpp b/flang/lib/Evaluate/shape.cpp
index c7b2156a3de17a..f9d169e752cae5 100644
--- a/flang/lib/Evaluate/shape.cpp
+++ b/flang/lib/Evaluate/shape.cpp
@@ -566,13 +566,13 @@ MaybeExtentExpr GetExtent(const Subscript &subscript, const NamedEntity &base,
                 MaybeExtentExpr{triplet.stride()});
           },
           [&](const IndirectSubscriptIntegerExpr &subs) -> MaybeExtentExpr {
-            if (auto shape{GetShape(subs.value())}) {
-              if (GetRank(*shape) > 0) {
-                CHECK(GetRank(*shape) == 1); // vector-valued subscript
-                return std::move(shape->at(0));
-              }
+            if (auto shape{GetShape(subs.value())};
+                shape && GetRank(*shape) == 1) {
+              // vector-valued subscript
+              return std::move(shape->at(0));
+            } else {
+              return std::nullopt;
             }
-            return std::nullopt;
           },
       },
       subscript.u);

diff  --git a/flang/test/Semantics/bug121971.f90 b/flang/test/Semantics/bug121971.f90
new file mode 100644
index 00000000000000..4192f6de2ec1f7
--- /dev/null
+++ b/flang/test/Semantics/bug121971.f90
@@ -0,0 +1,10 @@
+! RUN: %python %S/test_errors.py %s %flang_fc1
+subroutine subr(a,b,n,m)
+  real n,m
+!ERROR: Must have INTEGER type, but is REAL(4)
+!ERROR: Must have INTEGER type, but is REAL(4)
+  integer a(n,m)
+!ERROR: Rank of left-hand side is 2, but right-hand side has rank 1
+!ERROR: Subscript expression has rank 2 greater than 1
+  a = a(a,j)
+end