From b0ebcdc8e4f39a2dbf5c4e28b9ae787b26ff3dc0 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Sun, 22 Feb 2015 20:42:49 +0100 Subject: [PATCH] * src/sfnt/ttpost.c (load_format_20): Fix error tracing message. Bug introduced 6 commits earlier. --- ChangeLog | 6 ++++++ src/sfnt/ttpost.c | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c06a10ecf..3c07838db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2015-02-22 Werner Lemberg + + * src/sfnt/ttpost.c (load_format_20): Fix error tracing message. + + Bug introduced 6 commits earlier. + 2015-02-22 Werner Lemberg [pshinter] Fix thinko. diff --git a/src/sfnt/ttpost.c b/src/sfnt/ttpost.c index 804fd0e26..bf13a5c8d 100644 --- a/src/sfnt/ttpost.c +++ b/src/sfnt/ttpost.c @@ -246,11 +246,14 @@ if ( len > post_limit || FT_STREAM_POS() > post_limit - len ) { + FT_Int d = post_limit - FT_STREAM_POS(); + + FT_ERROR(( "load_format_20:" " exceeding string length (%d)," " truncating at end of post table (%d byte left)\n", - len, post_limit - FT_STREAM_POS() )); - len = FT_MAX( 0, post_limit - FT_STREAM_POS() ); + len, d )); + len = (FT_UInt)FT_MAX( 0, d ); } if ( FT_NEW_ARRAY( name_strings[n], len + 1 ) ||