FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR fortran/46884 (Use of charlen after free)

Browse source 
PR fortran/46884
	* symbol.c (gfc_new_charlen): If old_cl is non-NULL, put it
	at the ns->old_cl_list spot in the chain rather than at
	ns->cl_list.

	* gfortran.dg/pr46884.f: New test.

From-SVN: r167742
This commit is contained in:
Jakub Jelinek 2010-12-13 12:11:22 +01:00
parent f436d2ff95
commit 7d7ff3a1c8
4 changed files with 35 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gcc/fortran/ChangeLog
View file

@ -1,6 +1,13 @@
2010-12-13 Jakub Jelinek <jakub@redhat.com>
PR fortran/46884
* symbol.c (gfc_new_charlen): If old_cl is non-NULL, put it
at the ns->old_cl_list spot in the chain rather than at
ns->cl_list.
2010-12-12 Thomas Koenig <tkoenig@gcc.gnu.org>
* dump-parse-tree.c (show_expr): Add space for parens.
* dump-parse-tree.c (show_expr): Add space for parens.
2010-12-12 Janus Weil <janus@gcc.gnu.org>

18
gcc/fortran/symbol.c
View file

@ -3219,19 +3219,29 @@ gfc_new_charlen (gfc_namespace *ns, gfc_charlen *old_cl)
gfc_charlen *cl;
cl = gfc_get_charlen ();
/* Put into namespace. */
cl->next = ns->cl_list;
ns->cl_list = cl;
/* Copy old_cl. */
if (old_cl)
{
/* Put into namespace, but don't allow reject_statement
to free it if old_cl is given. */
gfc_charlen **prev = &ns->cl_list;
cl->next = ns->old_cl_list;
while (*prev != ns->old_cl_list)
prev = &(*prev)->next;
*prev = cl;
ns->old_cl_list = cl;
cl->length = gfc_copy_expr (old_cl->length);
cl->length_from_typespec = old_cl->length_from_typespec;
cl->backend_decl = old_cl->backend_decl;
cl->passed_length = old_cl->passed_length;
cl->resolved = old_cl->resolved;
}
else
{
/* Put into namespace. */
cl->next = ns->cl_list;
ns->cl_list = cl;
}
return cl;
}

5
gcc/testsuite/ChangeLog
View file

@ -1,3 +1,8 @@
2010-12-13 Jakub Jelinek <jakub@redhat.com>
PR fortran/46884
* gfortran.dg/pr46884.f: New test.
2010-12-13 Iain Sandoe <iains@gcc.gnu.org>
* objc.dg/gnu-encoding/struct-layout-encoding-1_generate.c:

8
gcc/testsuite/gfortran.dg/pr46884.f Normal file
View file

@ -0,0 +1,8 @@
C PR fortran/46884
C { dg-do compile }
C { dg-options "" }
SUBROUTINE F
IMPLICIT CHARACTER*12 (C)
CALL G(C1)
CALL H(C1(1:4))
END