mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-13 21:01:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

PR fortran/70070 - ICE on initializing character data beyond min/max bound

Browse Source 
Check for initialization of substrings beyond bounds in DATA statements.

gcc/fortran/ChangeLog:

	PR fortran/70070
	* data.c (create_character_initializer): Check substring indices
	against bounds.
	(gfc_assign_data_value): Catch error returned from
	create_character_initializer.

gcc/testsuite/ChangeLog:

	PR fortran/70070
	* gfortran.dg/pr70070.f90: New test.
This commit is contained in:
Harald Anlauf 2021-01-25 21:33:53 +01:00
parent d6f1cf644c
commit a61efd4693
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gcc/fortran/data.c
View File

@ -183,6 +183,19 @@ create_character_initializer (gfc_expr *init, gfc_typespec *ts,
}
}
if (start < 0)
{
gfc_error ("Substring start index at %L is less than one",
&ref->u.ss.start->where);
return NULL;
}
if (end > init->value.character.length)
{
gfc_error ("Substring end index at %L exceeds the string length",
&ref->u.ss.end->where);
return NULL;
}
if (rvalue->ts.type == BT_HOLLERITH)
{
for (size_t i = 0; i < (size_t) len; i++)
@ -576,6 +589,8 @@ gfc_assign_data_value (gfc_expr *lvalue, gfc_expr *rvalue, mpz_t index,
if (lvalue->ts.u.cl->length == NULL && !(ref && ref->u.ss.length != NULL))
return false;
expr = create_character_initializer (init, last_ts, ref, rvalue);
if (!expr)
return false;
}
else
{

8
gcc/testsuite/gfortran.dg/pr70070.f90 Normal file
View File

@ -0,0 +1,8 @@
! { dg-do compile }
! PR fortran/70070 - ICE on initializing character data beyond min/max bound
program p
character(1) :: a, b
data (a(i:i),i=0,0) /1*'#'/ ! { dg-error "Substring start index" }
data (b(i:i),i=2,3) /2*'#'/ ! { dg-error "Substring end index" }
end