From cada8741cc3d25284c4c239ee4c10fbe556144b9 Mon Sep 17 00:00:00 2001 From: kargl Date: Fri, 21 Oct 2011 22:48:39 +0000 Subject: [PATCH] 2011-10-20 Steven G. Kargl PR fortran/50821 * check.c (gfc_check_ishftc): Check args are constant before extracting the integer. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@180316 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/check.c | 33 ++++++++++++++++++++------------- 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index e58dd112aed..251bd45fd26 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,5 +1,11 @@ 2011-10-20 Steven G. Kargl + PR fortran/50821 + * check.c (gfc_check_ishftc): Check args are constant before + extracting the integer. + +2011-10-20 Steven G. Kargl + PR fortran/50514 * check.c (less_than_bitsize1): Check |shift| <= bit_size(i). (gfc_check_ishftc): Check |shift| <= bit_size(i) and check diff --git a/gcc/fortran/check.c b/gcc/fortran/check.c index 9aaad01ca36..34b3a68057c 100644 --- a/gcc/fortran/check.c +++ b/gcc/fortran/check.c @@ -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) -- 2.11.4.GIT