[freetype2] master 14213b5: [truetype] Improve TT_CONFIG_OPTION_MAX_RUNNABLE_OPCODES (#46223).

[Werner LEMBERG]

branch: master
commit 14213b54099dac557c9181922c45c258a32f0185
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>

    [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(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 369bef4..0e1c868 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2015-10-18  Werner Lemberg  <address@hidden>
 
+       [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  <address@hidden>
+
        [truetype] Better protection against malformed `fpgm' (#46223).
 
        * src/truetype/ttobjs.c (tt_size_init_bytecode): Don't execute a
diff --git a/devel/ftoption.h b/devel/ftoption.h
index 0eb8324..f68b3ad 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 270c566..b481f8f 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
 
 
   /*************************************************************************/