From e3d976ae009b873596b47961869b7cdfc41d7e67 Mon Sep 17 00:00:00 2001 From: Harald Anlauf Date: Wed, 24 Jun 2020 22:44:11 +0200 Subject: [PATCH] Revert "PR fortran/95689 - ICE in check_sym_interfaces, at fortran/interface.c:2015" With submodules, name mangling of interfaces may result in long internal symbols overflowing an internal buffer. We now check that we do not exceed the enlarged buffer size. gcc/fortran/ PR fortran/95689 * interface.c (check_sym_interfaces): Enlarge temporary buffer, and add check on length on mangled name to prevent overflow. gcc/testsuite/ PR fortran/95689 * gfortran.dg/pr95689.f90: New test. (reverts the cherry-pick from commit 62c0c0ea7bfb6f8f6b8d767b05120cafb6823da6) --- gcc/fortran/interface.c | 5 +---- gcc/testsuite/gfortran.dg/pr95689.f90 | 16 ---------------- 2 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 gcc/testsuite/gfortran.dg/pr95689.f90 diff --git a/gcc/fortran/interface.c b/gcc/fortran/interface.c index 698160a78608..29af409dde00 100644 --- a/gcc/fortran/interface.c +++ b/gcc/fortran/interface.c @@ -1972,8 +1972,7 @@ check_interface1 (gfc_interface *p, gfc_interface *q0, static void check_sym_interfaces (gfc_symbol *sym) { - /* Provide sufficient space to hold "generic interface 'symbol.symbol'". */ - char interface_name[2*GFC_MAX_SYMBOL_LEN+2 + sizeof("generic interface ''")]; + char interface_name[GFC_MAX_SYMBOL_LEN + sizeof("generic interface ''")]; gfc_interface *p; if (sym->ns != gfc_current_ns) @@ -1981,8 +1980,6 @@ check_sym_interfaces (gfc_symbol *sym) if (sym->generic != NULL) { - size_t len = strlen (sym->name) + sizeof("generic interface ''"); - gcc_assert (len < sizeof (interface_name)); sprintf (interface_name, "generic interface '%s'", sym->name); if (check_interface0 (sym->generic, interface_name)) return; diff --git a/gcc/testsuite/gfortran.dg/pr95689.f90 b/gcc/testsuite/gfortran.dg/pr95689.f90 deleted file mode 100644 index 287ae50b0cba..000000000000 --- a/gcc/testsuite/gfortran.dg/pr95689.f90 +++ /dev/null @@ -1,16 +0,0 @@ -! { dg-do compile } -! { dg-options "-fsecond-underscore" } -! PR fortran/95689 - ICE in check_sym_interfaces, at fortran/interface.c:2015 - -module m2345678901234567890123456789012345678901234567890123456789_123 - type t2345678901234567890123456789012345678901234567890123456789_123 - end type - interface - module subroutine s2345678901234567890123456789012345678901234567890123456789_123 & - (x2345678901234567890123456789012345678901234567890123456789_123) - end - end interface -end -submodule(m2345678901234567890123456789012345678901234567890123456789_123) & - t2345678901234567890123456789012345678901234567890123456789_123 -end -- 2.47.2