From 14213b54099dac557c9181922c45c258a32f0185 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Sun, 18 Oct 2015 18:15:04 +0200 Subject: [PATCH] [truetype] Improve TT_CONFIG_OPTION_MAX_RUNNABLE_OPCODES (#46223). * devel/ftoption.h, include/freetype/config/ftoption.h: Surround it with #ifndef ... #endif, as suggested in the tracker issue. --- ChangeLog | 7 +++++++ devel/ftoption.h | 7 +++++++ include/freetype/config/ftoption.h | 7 +++++++ 3 files changed, 21 insertions(+) diff --git a/ChangeLog b/ChangeLog index 369bef47a..0e1c86805 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2015-10-18 Werner Lemberg + + [truetype] Improve TT_CONFIG_OPTION_MAX_RUNNABLE_OPCODES (#46223). + + * devel/ftoption.h, include/freetype/config/ftoption.h: Surround it + with #ifndef ... #endif, as suggested in the tracker issue. + 2015-10-18 Werner Lemberg [truetype] Better protection against malformed `fpgm' (#46223). diff --git a/devel/ftoption.h b/devel/ftoption.h index 0eb832405..f68b3adec 100644 --- a/devel/ftoption.h +++ b/devel/ftoption.h @@ -700,7 +700,14 @@ FT_BEGIN_HEADER /* want to change this except for very special situations (e.g., making */ /* a library fuzzer spend less time to handle broken fonts). */ /* */ + /* It is not expected that this value is ever modified by a configuring */ + /* script; instead, it gets surrounded with #ifndef ... #endif so that */ + /* the value can be set as a preprocessor option on the compiler's */ + /* command line. */ + /* */ +#ifndef TT_CONFIG_OPTION_MAX_RUNNABLE_OPCODES #define TT_CONFIG_OPTION_MAX_RUNNABLE_OPCODES 1000000L +#endif /*************************************************************************/ diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h index 270c566b8..b481f8fba 100644 --- a/include/freetype/config/ftoption.h +++ b/include/freetype/config/ftoption.h @@ -700,7 +700,14 @@ FT_BEGIN_HEADER /* want to change this except for very special situations (e.g., making */ /* a library fuzzer spend less time to handle broken fonts). */ /* */ + /* It is not expected that this value is ever modified by a configuring */ + /* script; instead, it gets surrounded with #ifndef ... #endif so that */ + /* the value can be set as a preprocessor option on the compiler's */ + /* command line. */ + /* */ +#ifndef TT_CONFIG_OPTION_MAX_RUNNABLE_OPCODES #define TT_CONFIG_OPTION_MAX_RUNNABLE_OPCODES 1000000L +#endif /*************************************************************************/