summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Lemberg <wl@gnu.org>2018-10-20 07:27:47 +0200
committerWerner Lemberg <wl@gnu.org>2018-10-20 07:27:47 +0200
commitf56830ed406f90f6f53ee6367f2068a0f27bf90b (patch)
tree0cc60e29ec613e38d0048623c3ade942f7e69343
parent0c4feb72cf976f63d4bf62436bc48f190d0e0c28 (diff)
downloadfreetype2-f56830ed406f90f6f53ee6367f2068a0f27bf90b.tar.gz
Avoid endless loop while tracing (#54858).
* src/type1/t1load.c (parse_buildchar): Guard tracing stuff with FT_DEBUG_LEVEL_TRACE.
-rw-r--r--ChangeLog7
-rw-r--r--src/type1/t1load.c20
2 files changed, 20 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 44e8373f8..d96be8497 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2018-10-20 Werner Lemberg <wl@gnu.org>
+
+ Avoid endless loop while tracing (#54858).
+
+ * src/type1/t1load.c (parse_buildchar): Guard tracing stuff with
+ FT_DEBUG_LEVEL_TRACE.
+
2018-10-17 David Demelier <markand@malikania.fr>
* CMakeLists.txt: Specify `RUNTIME DESTINATION'.
diff --git a/src/type1/t1load.c b/src/type1/t1load.c
index b33739b08..e358c3255 100644
--- a/src/type1/t1load.c
+++ b/src/type1/t1load.c
@@ -1062,16 +1062,22 @@
parse_buildchar( T1_Face face,
T1_Loader loader )
{
- FT_UInt i;
-
-
face->len_buildchar = (FT_UInt)T1_ToFixedArray( &loader->parser,
0, NULL, 0 );
- FT_TRACE4(( " [" ));
- for ( i = 0; i < face->len_buildchar; i++ )
- FT_TRACE4(( " 0" ));
- FT_TRACE4(( "]\n" ));
+#ifdef FT_DEBUG_LEVEL_TRACE
+ {
+ FT_UInt i;
+
+
+ FT_TRACE4(( " [" ));
+ for ( i = 0; i < face->len_buildchar; i++ )
+ FT_TRACE4(( " 0" ));
+
+ FT_TRACE4(( "]\n" ));
+ }
+#endif
+
return;
}