Commit a693d9b3 by Martin Liska Committed by Martin Liska

Do not dereference NULL pointer in resolve_ref (PR fortran/89185).

2019-02-04  Martin Liska  <mliska@suse.cz>

	PR fortran/89185
	* resolve.c (resolve_ref): Remove breakout variable as
	we need to prevent prev = &(*prev)->next to happen
	with *prev == NULL.

From-SVN: r268521
parent 13157c10
2019-02-04 Martin Liska <mliska@suse.cz> 2019-02-04 Martin Liska <mliska@suse.cz>
PR fortran/89185
* resolve.c (resolve_ref): Remove breakout variable as
we need to prevent prev = &(*prev)->next to happen
with *prev == NULL.
2019-02-04 Martin Liska <mliska@suse.cz>
PR fortran/88912 PR fortran/88912
* scanner.c (load_file): Report error for -fpre-include * scanner.c (load_file): Report error for -fpre-include
file and do not ICE. file and do not ICE.
......
...@@ -5046,7 +5046,6 @@ resolve_ref (gfc_expr *expr) ...@@ -5046,7 +5046,6 @@ resolve_ref (gfc_expr *expr)
int current_part_dimension, n_components, seen_part_dimension; int current_part_dimension, n_components, seen_part_dimension;
gfc_ref *ref, **prev; gfc_ref *ref, **prev;
bool equal_length; bool equal_length;
bool breakout;
for (ref = expr->ref; ref; ref = ref->next) for (ref = expr->ref; ref; ref = ref->next)
if (ref->type == REF_ARRAY && ref->u.ar.as == NULL) if (ref->type == REF_ARRAY && ref->u.ar.as == NULL)
...@@ -5055,8 +5054,8 @@ resolve_ref (gfc_expr *expr) ...@@ -5055,8 +5054,8 @@ resolve_ref (gfc_expr *expr)
break; break;
} }
breakout = false; for (prev = &expr->ref; *prev != NULL;
for (prev = &expr->ref; !breakout && *prev != NULL; prev = &(*prev)->next) prev = *prev == NULL ? prev : &(*prev)->next)
switch ((*prev)->type) switch ((*prev)->type)
{ {
case REF_ARRAY: case REF_ARRAY:
...@@ -5082,8 +5081,6 @@ resolve_ref (gfc_expr *expr) ...@@ -5082,8 +5081,6 @@ resolve_ref (gfc_expr *expr)
expr->ts.u.cl = ref->u.ss.length; expr->ts.u.cl = ref->u.ss.length;
ref->u.ss.length = NULL; ref->u.ss.length = NULL;
gfc_free_ref_list (ref); gfc_free_ref_list (ref);
if (*prev == NULL)
breakout = true;
} }
break; break;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment