summaryrefslogtreecommitdiffstats
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/fortran/ChangeLog4
-rw-r--r--gcc/fortran/expr.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 7507564b438..b612122dd4f 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 5867f9bfaa5..f4a4b589b1f 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);
OpenPOWER on IntegriCloud