summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjvdelisle <jvdelisle@138bc75d-0d04-0410-961f-82ee72b054a4>2017-10-27 17:50:22 +0000
committerjvdelisle <jvdelisle@138bc75d-0d04-0410-961f-82ee72b054a4>2017-10-27 17:50:22 +0000
commit2b87662b1b63f423d4d36e82bfc00ea37ef5f5c7 (patch)
tree738d184a57a75c64c70cff911a4ff6e0fe0e6ef4
parentfeb4740e880dc4e238df021cf2dc89188f5380fc (diff)
downloadgcc-2b87662b1b63f423d4d36e82bfc00ea37ef5f5c7.tar.gz
2017-10-27 Jerry DeLisle <jvdelisle@gcc.gnu.org>
Rimvydas (RJ) PR libgfortran/81938 io/format.c (free_format_data): Don't try to free vlist descriptors past the end of the fnode array. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@254163 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--libgfortran/ChangeLog7
-rw-r--r--libgfortran/io/format.c3
2 files changed, 9 insertions, 1 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index ef9ef19b68b..9e52ece6e15 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,10 @@
+2017-10-27 Jerry DeLisle <jvdelisle@gcc.gnu.org>
+ Rimvydas (RJ)
+
+ PR libgfortran/81938
+ io/format.c (free_format_data): Don't try to free vlist
+ descriptors past the end of the fnode array.
+
2017-10-10 Thomas Koenig <tkoenig@gcc.gnu.org>
PR libfortran/82233
diff --git a/libgfortran/io/format.c b/libgfortran/io/format.c
index bd14ac37bb3..c2abdd7b3af 100644
--- a/libgfortran/io/format.c
+++ b/libgfortran/io/format.c
@@ -266,7 +266,8 @@ free_format_data (format_data *fmt)
return;
/* Free vlist descriptors in the fnode_array if one was allocated. */
- for (fnp = fmt->array.array; fnp->format != FMT_NONE; fnp++)
+ for (fnp = fmt->array.array; fnp < &fmt->array.array[FARRAY_SIZE] &&
+ fnp->format != FMT_NONE; fnp++)
if (fnp->format == FMT_DT)
{
if (GFC_DESCRIPTOR_DATA(fnp->u.udf.vlist))