[PR fortran/77583, patch ]- ICE in pp_quoted_string, at pretty-print.c:966

[PR fortran/77583, patch ]- ICE in pp_quoted_string, at pretty-print.c:966

[Harald Anlauf]

[-- Attachment #1: Type: text/plain, Size: 526 bytes --]

The attached patch (originally by Steve Kargl) fixes a NULL pointer
dereference that may occur when checking for a conflict.

Regtested successfully.

OK for trunk?  Backport to active branches?

Thanks,
Harald

2019-03-02  Harald Anlauf  <anlauf@gmx.de>
	    Steve Kargl  <sgk@troutmask.apl.washington.edu>

	PR fortran/77583
	* symbol.c (check_conflict): Check for valid procedure name
	passed to error reporting routine.

2019-03-02  Harald Anlauf  <anlauf@gmx.de>

	PR fortran/77583
	* gfortran.dg/pr77583.f90: New test.


[-- Attachment #2: patch-pr77583 --]
[-- Type: text/plain, Size: 601 bytes --]

Index: gcc/fortran/symbol.c
===================================================================
--- gcc/fortran/symbol.c	(revision 269332)
+++ gcc/fortran/symbol.c	(working copy)
@@ -525,7 +525,7 @@
   /* The copying of procedure dummy arguments for module procedures in
      a submodule occur whilst the current state is COMP_CONTAINS. It
      is necessary, therefore, to let this through.  */
-  if (attr->dummy
+  if (name && attr->dummy
       && (attr->function || attr->subroutine)
       && gfc_current_state () == COMP_CONTAINS
       && !(gfc_new_block && gfc_new_block->abr_modproc_decl))

[-- Attachment #3: patch-pr77583-testcase --]
[-- Type: text/plain, Size: 531 bytes --]

Index: gcc/testsuite/gfortran.dg/pr77583.f90
===================================================================
--- gcc/testsuite/gfortran.dg/pr77583.f90	(nonexistent)
+++ gcc/testsuite/gfortran.dg/pr77583.f90	(working copy)
@@ -0,0 +1,10 @@
+! { dg-do compile }
+!
+! PR fortran/77583 - ICE in pp_quoted_string, at pretty-print.c:966
+! Contributed by Gerhard Steinmetz <gerhard.steinmetz.fortran@t-online.de>
+
+pure subroutine sub(s)
+contains
+   pure subroutine s  ! { dg-error "conflicts with DUMMY argument" }
+   end
+end

Re: [PR fortran/77583, patch ]- ICE in pp_quoted_string, at pretty-print.c:966

[Steve Kargl]

On Sat, Mar 02, 2019 at 12:12:10AM +0100, Harald Anlauf wrote:
> The attached patch (originally by Steve Kargl) fixes a NULL pointer
> dereference that may occur when checking for a conflict.
> 
> Regtested successfully.
> 
> OK for trunk?  Backport to active branches?
> 
> 
> 2019-03-02  Harald Anlauf  <anlauf@gmx.de>
> 	    Steve Kargl  <sgk@troutmask.apl.washington.edu>

            Steven G. Kargl  <kargl@gcc.gnu.org>

;-)

I, of course, approve of the patch, but you might give
others a chance to disagree.

-- 
Steve

Re: [PR fortran/77583, patch ]- ICE in pp_quoted_string, at pretty-print.c:966

[Harald Anlauf]

I didn't see any disagreement, so committed to trunk (rev.269353)
and "backported" to 7- and 8-branches.

Thanks,
Harald

On 03/02/19 00:15, Steve Kargl wrote:
> On Sat, Mar 02, 2019 at 12:12:10AM +0100, Harald Anlauf wrote:
>> The attached patch (originally by Steve Kargl) fixes a NULL pointer
>> dereference that may occur when checking for a conflict.
>>
>> Regtested successfully.
>>
>> OK for trunk?  Backport to active branches?
>>
>>
>> 2019-03-02  Harald Anlauf  <anlauf@gmx.de>
>> 	    Steve Kargl  <sgk@troutmask.apl.washington.edu>
> 
>             Steven G. Kargl  <kargl@gcc.gnu.org>
> 
> ;-)
> 
> I, of course, approve of the patch, but you might give
> others a chance to disagree.
>