aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorHarald Anlauf <anlauf@gmx.de>2020-06-04 21:00:33 +0200
committerHarald Anlauf <anlauf@gmx.de>2020-06-04 21:01:26 +0200
commit8c727bdf4acf28c8315b119a1c8f6d6af745c2af (patch)
treef211076b345efb1ed51b91893aff5a07d8c0771a /gcc
parent4f2d05ef0142d269964e165c14c6f7fe4bdfd5a3 (diff)
downloadgcc-8c727bdf4acf28c8315b119a1c8f6d6af745c2af.zip
gcc-8c727bdf4acf28c8315b119a1c8f6d6af745c2af.tar.gz
gcc-8c727bdf4acf28c8315b119a1c8f6d6af745c2af.tar.bz2
PR fortran/95500 - Segfault compiling extra interface on intrinsic
Converting an expression so that it can be passed by reference could result in a NULL pointer dereference. 2020-06-04 Steven G. Kargl <kargl@gcc.gnu.org> Harald Anlauf <anlauf@gmx.de> gcc/fortran/ PR fortran/95500 * trans-expr.c (gfc_conv_expr_reference): Do not dereference NULL pointer. gcc/testsuite/ PR fortran/95500 * gfortran.dg/pr95500.f90: New test.
Diffstat (limited to 'gcc')
-rw-r--r--gcc/fortran/trans-expr.c1
-rw-r--r--gcc/testsuite/gfortran.dg/pr95500.f9015
2 files changed, 16 insertions, 0 deletions
diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c
index 435eaeb..8b2afd2 100644
--- a/gcc/fortran/trans-expr.c
+++ b/gcc/fortran/trans-expr.c
@@ -8811,6 +8811,7 @@ gfc_conv_expr_reference (gfc_se * se, gfc_expr * expr, bool add_clobber)
if (expr->expr_type == EXPR_FUNCTION
&& ((expr->value.function.esym
+ && expr->value.function.esym->result
&& expr->value.function.esym->result->attr.pointer
&& !expr->value.function.esym->result->attr.dimension)
|| (!expr->value.function.esym && !expr->ref
diff --git a/gcc/testsuite/gfortran.dg/pr95500.f90 b/gcc/testsuite/gfortran.dg/pr95500.f90
new file mode 100644
index 0000000..e9eb7c6
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr95500.f90
@@ -0,0 +1,15 @@
+! { dg-do compile }
+! PR fortran/95500 - ICE compiling extra interface on intrinsic
+
+program test_intrinsic
+ implicit none
+ intrinsic :: alog
+ intrinsic :: dlog
+ real (4), parameter :: one = 1
+
+ interface ln
+ procedure :: alog, dlog
+ end interface ln
+
+ write (*,*) 'ln 1', ln (one)
+end program test_intrinsic