From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2153) id BC42F398B89A; Thu, 17 Sep 2020 17:08:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BC42F398B89A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1600362495; bh=rW7b23xmb/gYFahS89uOEENYEet4gEzGaIxTFtHBFrU=; h=From:To:Subject:Date:From; b=RWOtFJ3vfrNGsCkCvrdLAAx6zjBq1Ns/2LhtbGitT0C/XrQXTNaOJTStQ5axyS2ac 26hlV0poMcdlUQ9huOdlBGg7BIHWBw19pPI0ixsd6PuEaMva+V3HW3zQrXfmpd4XUe HBjdOBmR0koP1ZL5OGnMwkZ7OOpy9KlZAURdu8Hk= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Jakub Jelinek To: gcc-cvs@gcc.gnu.org Subject: [gcc(refs/vendors/redhat/heads/gcc-8-branch)] PR fortran/95689 - ICE in check_sym_interfaces, at fortran/interface.c:2015 X-Act-Checkin: gcc X-Git-Author: Harald Anlauf X-Git-Refname: refs/vendors/redhat/heads/gcc-8-branch X-Git-Oldrev: 92cd3f0f7431f19c354e7cb657aca0e5dad2257d X-Git-Newrev: 7bac7d19449c1d0e1bde97534ac43627e28526a5 Message-Id: <20200917170815.BC42F398B89A@sourceware.org> Date: Thu, 17 Sep 2020 17:08:15 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Sep 2020 17:08:15 -0000 https://gcc.gnu.org/g:7bac7d19449c1d0e1bde97534ac43627e28526a5 commit 7bac7d19449c1d0e1bde97534ac43627e28526a5 Author: Harald Anlauf Date: Sat Jun 20 16:09:45 2020 +0200 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. (cherry picked from commit 62c0c0ea7bfb6f8f6b8d767b05120cafb6823da6) Diff: --- gcc/fortran/interface.c | 5 ++++- gcc/testsuite/gfortran.dg/pr95689.f90 | 16 ++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/gcc/fortran/interface.c b/gcc/fortran/interface.c index 689c30210d7..ec8fd3a8f68 100644 --- a/gcc/fortran/interface.c +++ b/gcc/fortran/interface.c @@ -1944,7 +1944,8 @@ check_interface1 (gfc_interface *p, gfc_interface *q0, static void check_sym_interfaces (gfc_symbol *sym) { - char interface_name[GFC_MAX_SYMBOL_LEN + sizeof("generic interface ''")]; + /* Provide sufficient space to hold "generic interface 'symbol.symbol'". */ + char interface_name[2*GFC_MAX_SYMBOL_LEN+2 + sizeof("generic interface ''")]; gfc_interface *p; if (sym->ns != gfc_current_ns) @@ -1952,6 +1953,8 @@ 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 new file mode 100644 index 00000000000..287ae50b0cb --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr95689.f90 @@ -0,0 +1,16 @@ +! { 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