diff mbox series

[committed] PR fortran/100892 - ICE on procedure pointer to function returning array of size n

Message ID trinity-43ae917d-ac95-4992-94c1-862ecd9b52d5-1648673004681@3c-app-gmx-bap30
State New
Headers show
Series [committed] PR fortran/100892 - ICE on procedure pointer to function returning array of size n | expand

Commit Message

Harald Anlauf March 30, 2022, 8:43 p.m. UTC 
Dear all,

I committed the attached patch as obvious: we had a NULL pointer
dereference when checking the arguments of the ASSOCIATED intrinsic
when the target was an array-valued function.

Regtested on x86_64-pc-linux-gnu.

Thanks,
Harald
diff mbox series

Patch

From b4e4b35f4ebe561826489bed971324efc99c5423 Mon Sep 17 00:00:00 2001
From: Harald Anlauf <anlauf@gmx.de>
Date: Wed, 30 Mar 2022 22:36:12 +0200
Subject: [PATCH] Fortran: NULL pointer dereference checking arguments to
 ASSOCIATED intrinsic

gcc/fortran/ChangeLog:

	PR fortran/100892
	* check.cc (gfc_check_associated): Avoid NULL pointer dereference.

gcc/testsuite/ChangeLog:

	PR fortran/100892
	* gfortran.dg/associated_target_8.f90: New test.
---
 gcc/fortran/check.cc                             |  2 +-
 .../gfortran.dg/associated_target_8.f90          | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/gfortran.dg/associated_target_8.f90

diff --git a/gcc/fortran/check.cc b/gcc/fortran/check.cc
index fc97bb1371e..0c2cb50c6a7 100644
--- a/gcc/fortran/check.cc
+++ b/gcc/fortran/check.cc
@@ -1504,7 +1504,7 @@  gfc_check_associated (gfc_expr *pointer, gfc_expr *target)
      argument of intrinsic inquiry functions.  */
   if (pointer->rank != -1 && !rank_check (target, 0, pointer->rank))
     t = false;
-  if (target->rank > 0)
+  if (target->rank > 0 && target->ref)
     {
       for (i = 0; i < target->rank; i++)
 	if (target->ref->u.ar.dimen_type[i] == DIMEN_VECTOR)
diff --git a/gcc/testsuite/gfortran.dg/associated_target_8.f90 b/gcc/testsuite/gfortran.dg/associated_target_8.f90
new file mode 100644
index 00000000000..75c2740a188
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/associated_target_8.f90
@@ -0,0 +1,16 @@ 
+! { dg-do compile }
+! PR fortran/100892 - procedure pointer to function returning array of size n
+
+module m
+  implicit none
+  procedure(func1), pointer :: my_ptr => null()
+contains
+  subroutine test_sub
+    if (associated (my_ptr, func1)) print *,'associated'
+  end subroutine test_sub
+  function func1 (n)
+    integer, intent(in) :: n
+    real, dimension(n)  :: func1
+    func1 = 0.
+  end function
+end module m
--
2.34.1