diff options
| author | Steven G. Kargl <kargls@comcast.net> | 2005-03-04 17:09:18 +0000 |
|---|---|---|
| committer | Steven G. Kargl <kargl@gcc.gnu.org> | 2005-03-04 17:09:18 +0000 |
| commit | 37e860a298acde8c2e62f20adf4018fa74af2301 (patch) | |
| tree | f1c33486dc9c123e9d50d22400d055cc28f5dbe2 /gcc | |
| parent | 7235c3007d0da74919e1399cfab838b03b6f8c3b (diff) | |
| download | gcc-37e860a298acde8c2e62f20adf4018fa74af2301.zip gcc-37e860a298acde8c2e62f20adf4018fa74af2301.tar.gz gcc-37e860a298acde8c2e62f20adf4018fa74af2301.tar.bz2 | |
* expr.c (gfc_copy_shape_excluding): Change && to ||.
From-SVN: r95891
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/fortran/expr.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 7507564..b612122 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,7 @@ +Steven G. Kargl <kargls@comcast.net> + + * expr.c (gfc_copy_shape_excluding): Change && to ||. + 2005-03-04 Tobias Schl"uter <tobias.schlueter@physik.uni-muenchen.de> * trans-intrinsic.c (gfc_get_symbol_for_expr): Fix comment typo, diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c index 5867f9b..f4a4b589 100644 --- a/gcc/fortran/expr.c +++ b/gcc/fortran/expr.c @@ -352,7 +352,7 @@ gfc_copy_shape_excluding (mpz_t * shape, int rank, gfc_expr * dim) n = mpz_get_si (dim->value.integer); n--; /* Convert to zero based index */ - if (n < 0 && n >= rank) + if (n < 0 || n >= rank) return NULL; s = new_shape = gfc_get_shape (rank-1); |