diff options
| author | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2010-01-15 15:52:28 +0000 |
|---|---|---|
| committer | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2010-01-15 15:52:28 +0000 |
| commit | 601aa68fd9fbfa5716f55f28e4621cd5db2519b5 (patch) | |
| tree | 6789f0adc8213a5b1a45147e509f7575f9794ec7 | |
| parent | 1b8b9e1988139eedbd39a5bcee3ccacdd813132d (diff) | |
| download | gcc-601aa68fd9fbfa5716f55f28e4621cd5db2519b5.zip gcc-601aa68fd9fbfa5716f55f28e4621cd5db2519b5.tar.gz gcc-601aa68fd9fbfa5716f55f28e4621cd5db2519b5.tar.bz2 | |
format.c (parse_format): Set limit on size of format strings that will be cached.
2010-01-15 Jerry DeLisle <jvdelisle@gcc.gnu.org>
* io/format.c (parse_format): Set limit on size of format strings that
will be cached.
From-SVN: r155939
| -rw-r--r-- | libgfortran/ChangeLog | 5 | ||||
| -rw-r--r-- | libgfortran/io/format.c | 7 |
2 files changed, 11 insertions, 1 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index fbd9dd4..0b24143 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,8 @@ +2010-01-15 Jerry DeLisle <jvdelisle@gcc.gnu.org> + + * io/format.c (parse_format): Set limit on size of format strings that + will be cached. + 2010-01-05 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> * configure: Regenerate. diff --git a/libgfortran/io/format.c b/libgfortran/io/format.c index cafea87..13516d2 100644 --- a/libgfortran/io/format.c +++ b/libgfortran/io/format.c @@ -1212,13 +1212,18 @@ revert (st_parameter_dt *dtp) /* parse_format()-- Parse a format string. */ +#define FORMAT_CACHE_STRING_LIMIT 256 + void parse_format (st_parameter_dt *dtp) { format_data *fmt; bool format_cache_ok; - format_cache_ok = !is_internal_unit (dtp); + /* Don't cache for internal units and set an arbitrary limit on the size of + format strings we will cache. (Avoids memory issues.) */ + format_cache_ok = !is_internal_unit (dtp) + && (dtp->format_len < FORMAT_CACHE_STRING_LIMIT ); /* Lookup format string to see if it has already been parsed. */ if (format_cache_ok) |