From: Jerry DeLisle Date: Fri, 15 Jan 2010 15:52:28 +0000 (+0000) Subject: format.c (parse_format): Set limit on size of format strings that will be cached. X-Git-Tag: releases/gcc-4.5.0~1203 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=601aa68fd9fbfa5716f55f28e4621cd5db2519b5;p=thirdparty%2Fgcc.git format.c (parse_format): Set limit on size of format strings that will be cached. 2010-01-15 Jerry DeLisle * io/format.c (parse_format): Set limit on size of format strings that will be cached. From-SVN: r155939 --- diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index fbd9dd433091..0b24143c2b9f 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,8 @@ +2010-01-15 Jerry DeLisle + + * io/format.c (parse_format): Set limit on size of format strings that + will be cached. + 2010-01-05 Rainer Orth * configure: Regenerate. diff --git a/libgfortran/io/format.c b/libgfortran/io/format.c index cafea8732e46..13516d2f8a6b 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)