git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

re PR fortran/50821 (3 new GCC HEAD@180266 regressions) 

2011-10-20  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/50821
	* check.c (gfc_check_ishftc): Check args are constant before 
	extracting the integer.

From-SVN: r180316
This commit is contained in:
Steven G. Kargl 2011-10-21 22:48:39 +00:00
parent 74b388c339
commit 6d8c9e5c9a
2 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/fortran/ChangeLog
View File

@ -1,3 +1,9 @@
2011-10-20 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/50821
* check.c (gfc_check_ishftc): Check args are constant before
extracting the integer.
2011-10-20 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/50514

33
gcc/fortran/check.c
View File

@ -1967,22 +1967,29 @@ gfc_check_ishftc (gfc_expr *i, gfc_expr *shift, gfc_expr *size)
if (less_than_bitsize1 ("I", i, "SIZE", size, true) == FAILURE)
return FAILURE;
gfc_extract_int (size, &i3);
if (i3 <= 0)
if (size->expr_type == EXPR_CONSTANT)
{
gfc_error ("SIZE at %L must be positive", &size->where);
return FAILURE;
}
gfc_extract_int (size, &i3);
if (i3 <= 0)
{
gfc_error ("SIZE at %L must be positive", &size->where);
return FAILURE;
}
gfc_extract_int (shift, &i2);
if (i2 < 0)
i2 = -i2;
if (shift->expr_type == EXPR_CONSTANT)
{
gfc_extract_int (shift, &i2);
if (i2 < 0)
i2 = -i2;
if (i2 > i3)
{
gfc_error ("The absolute value of SHIFT at %L must be less than "
"or equal to SIZE at %L", &shift->where, &size->where);
return FAILURE;
if (i2 > i3)
{
gfc_error ("The absolute value of SHIFT at %L must be less "
"than or equal to SIZE at %L", &shift->where,
&size->where);
return FAILURE;
}
}
}
}
else if (less_than_bitsize1 ("I", i, NULL, shift, true) == FAILURE)