summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Wagner <bungeman@google.com>2018-11-27 18:02:44 +0100
committerWerner Lemberg <wl@gnu.org>2018-11-27 18:02:44 +0100
commit1fc6937f7fa3bd80edbadc1e3c69d21dd9929e74 (patch)
treec75f7531db6a6bec8e27bee76da29890e4f3a0f0
parent74cdd75f6fb5c6df74f12e4724ecd84edab0dddd (diff)
downloadfreetype2-1fc6937f7fa3bd80edbadc1e3c69d21dd9929e74.tar.gz
[cff] Fix compiler warning (#55105).
* src/cff/cffparse.c (cff_parser_run): Guard label only used if CFF_CONFIG_OPTION_OLD_ENGINE is active.
-rw-r--r--ChangeLog9
-rw-r--r--src/cff/cffparse.c2
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b10dffbfe..ac7368412 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
2018-11-27 Ben Wagner <bungeman@google.com>
- [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 <bungeman@google.com>
+
+ [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 );