From 1fc6937f7fa3bd80edbadc1e3c69d21dd9929e74 Mon Sep 17 00:00:00 2001 From: Ben Wagner Date: Tue, 27 Nov 2018 18:02:44 +0100 Subject: [PATCH] [cff] Fix compiler warning (#55105). * src/cff/cffparse.c (cff_parser_run): Guard label only used if CFF_CONFIG_OPTION_OLD_ENGINE is active. --- ChangeLog | 9 ++++++++- src/cff/cffparse.c | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b10dffbfe..ac7368412 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,13 @@ 2018-11-27 Ben Wagner - [truetype Fix numeric overflow (#55103). + [cff] Fix compiler warning (#55105). + + * src/cff/cffparse.c (cff_parser_run): Guard label only used if + CFF_CONFIG_OPTION_OLD_ENGINE is active. + +2018-11-27 Ben Wagner + + [truetype] Fix numeric overflow (#55103). * src/truetype/ttgload.c (compute_glyph_metrics): Use `SUB_LONG'. diff --git a/src/cff/cffparse.c b/src/cff/cffparse.c index db2c774a9..2ad5016e5 100644 --- a/src/cff/cffparse.c +++ b/src/cff/cffparse.c @@ -1534,9 +1534,11 @@ #endif return error; +#ifdef CFF_CONFIG_OPTION_OLD_ENGINE Out_Of_Memory_Error: error = FT_THROW( Out_Of_Memory ); goto Exit; +#endif Stack_Overflow: error = FT_THROW( Invalid_Argument );