summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven G. Kargl <kargl@gcc.gnu.org>2018-01-09 01:17:50 +0000
committerSteven G. Kargl <kargl@gcc.gnu.org>2018-01-09 01:17:50 +0000
commit8799df67f2dab88f9fda11739c501780a85575e2 (patch)
treec2b43e7ca1c6e860deaa82d4ec361dff237f9f92
parentc8a0c7b660a96081f320c8155f135a46b2202968 (diff)
downloadgcc-8799df67f2dab88f9fda11739c501780a85575e2.tar.gz
match.c (gfc_match_allocate): Check for NULL pointer.
2018-01-08 Steven G. Kargl <kargl@gcc.gnu.org> * match.c (gfc_match_allocate): Check for NULL pointer. From-SVN: r256364
-rw-r--r--gcc/fortran/ChangeLog4
-rw-r--r--gcc/fortran/match.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index adb82609d9d..32586c509f9 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,5 +1,9 @@
2018-01-08 Steven G. Kargl <kargl@gcc.gnu.org>
+ * match.c (gfc_match_allocate): Check for NULL pointer.
+
+2018-01-08 Steven G. Kargl <kargl@gcc.gnu.org>
+
* expr.c (gfc_check_pointer_assign): Fix typo in comment.
2018-01-08 Paul Thomas <pault@gcc.gnu.org>
diff --git a/gcc/fortran/match.c b/gcc/fortran/match.c
index 5e313c41fcf..320a0d8af55 100644
--- a/gcc/fortran/match.c
+++ b/gcc/fortran/match.c
@@ -4071,7 +4071,7 @@ gfc_match_allocate (void)
for which the corresponding type parameter is assumed. */
if (saw_assumed
&& (tail->expr->ts.deferred
- || tail->expr->ts.u.cl->length
+ || (tail->expr->ts.u.cl && tail->expr->ts.u.cl->length)
|| tail->expr->symtree->n.sym->attr.dummy == 0))
{
gfc_error ("Incompatible allocate-object at %C for CHARACTER "