diff options
| author | Martin Liska <mliska@suse.cz> | 2019-02-04 14:28:34 +0100 |
|---|---|---|
| committer | Martin Liska <marxin@gcc.gnu.org> | 2019-02-04 13:28:34 +0000 |
| commit | a693d9b3d69d905d4270c9d1b9fe0bc8d19a932e (patch) | |
| tree | c59536ff8a607ab1e7f6f754632f6eae79992284 | |
| parent | 13157c1056407bc8c7d0d28772981bdd7cbc82c4 (diff) | |
| download | gcc-a693d9b3d69d905d4270c9d1b9fe0bc8d19a932e.zip gcc-a693d9b3d69d905d4270c9d1b9fe0bc8d19a932e.tar.gz gcc-a693d9b3d69d905d4270c9d1b9fe0bc8d19a932e.tar.bz2 | |
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
| -rw-r--r-- | gcc/fortran/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/fortran/resolve.c | 7 |
2 files changed, 9 insertions, 5 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index c3b4a5c..1bd851a 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,5 +1,12 @@ 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 * scanner.c (load_file): Report error for -fpre-include file and do not ICE. diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 5e95777..92d27fc 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -5046,7 +5046,6 @@ resolve_ref (gfc_expr *expr) int current_part_dimension, n_components, seen_part_dimension; gfc_ref *ref, **prev; bool equal_length; - bool breakout; for (ref = expr->ref; ref; ref = ref->next) if (ref->type == REF_ARRAY && ref->u.ar.as == NULL) @@ -5055,8 +5054,8 @@ resolve_ref (gfc_expr *expr) break; } - breakout = false; - for (prev = &expr->ref; !breakout && *prev != NULL; prev = &(*prev)->next) + for (prev = &expr->ref; *prev != NULL; + prev = *prev == NULL ? prev : &(*prev)->next) switch ((*prev)->type) { case REF_ARRAY: @@ -5082,8 +5081,6 @@ resolve_ref (gfc_expr *expr) expr->ts.u.cl = ref->u.ss.length; ref->u.ss.length = NULL; gfc_free_ref_list (ref); - if (*prev == NULL) - breakout = true; } break; } |