aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran
diff options
context:
space:
mode:
authorPaul Thomas <pault@gcc.gnu.org>2006-09-15 16:30:52 +0000
committerPaul Thomas <pault@gcc.gnu.org>2006-09-15 16:30:52 +0000
commit8c5c0b80a45b77182c83c950fb9c7443859d7d98 (patch)
tree2ee9a5e258ea7946f8f29aa839fb77c92adbaa72 /gcc/fortran
parent906d8c784a5e3e9819238cd3f6e253f6f13f8657 (diff)
downloadgcc-8c5c0b80a45b77182c83c950fb9c7443859d7d98.zip
gcc-8c5c0b80a45b77182c83c950fb9c7443859d7d98.tar.gz
gcc-8c5c0b80a45b77182c83c950fb9c7443859d7d98.tar.bz2
re PR fortran/29051 (segfault when too few values are in data statement of character array)
2006-09-15 Paul Thomas <pault@gcc.gnu.org> PR fortran/29051 * decl.c (match_old_style_init): Set the 'where' field of the gfc_data structure 'newdata'. * match.c (match_case_eos): Add a comprehensible error message. 2006-09-15 Paul Thomas <pault@gcc.gnu.org> PR fortran/29051 * gfortran.dg/oldstyle_3.f90: New test. From-SVN: r116977
Diffstat (limited to 'gcc/fortran')
-rw-r--r--gcc/fortran/ChangeLog8
-rw-r--r--gcc/fortran/decl.c1
-rw-r--r--gcc/fortran/match.c5
3 files changed, 13 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 2e88fbf..371860a 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,11 @@
+2006-09-15 Paul Thomas <pault@gcc.gnu.org>
+
+ PR fortran/29051
+ * decl.c (match_old_style_init): Set the 'where' field of the
+ gfc_data structure 'newdata'.
+
+ * match.c (match_case_eos): Add a comprehensible error message.
+
2006-09-13 Wolfgang Gellerich <gellerich@de.ibm.com>
* trans-expr.c (gfc_add_interface_mapping): For characters, dereference
diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c
index 19bf1b0..6045b20 100644
--- a/gcc/fortran/decl.c
+++ b/gcc/fortran/decl.c
@@ -395,6 +395,7 @@ match_old_style_init (const char *name)
newdata = gfc_get_data ();
newdata->var = gfc_get_data_variable ();
newdata->var->expr = gfc_get_variable_expr (st);
+ newdata->where = gfc_current_locus;
/* Match initial value list. This also eats the terminal
'/'. */
diff --git a/gcc/fortran/match.c b/gcc/fortran/match.c
index d90fc47..3f393856 100644
--- a/gcc/fortran/match.c
+++ b/gcc/fortran/match.c
@@ -3056,7 +3056,10 @@ match_case_eos (void)
/* If the case construct doesn't have a case-construct-name, we
should have matched the EOS. */
if (!gfc_current_block ())
- return MATCH_ERROR;
+ {
+ gfc_error ("Expected the name of the select case construct at %C");
+ return MATCH_ERROR;
+ }
gfc_gobble_whitespace ();