From 5d1b8ab4d08155f9627891197a9d7b87da8333fe Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Fri, 31 Jul 2015 21:49:07 +0200 Subject: [PATCH] Define FT_LONG_MAX. * include/freetype/config/ftstdlib.h (FT_LONG_MAX): New macro. * src/cff/cf2arrst.c (cf2_arrstack_setNumElements): Use it. --- ChangeLog | 11 +++++++++-- include/freetype/config/ftstdlib.h | 1 + src/cff/cf2arrst.c | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 065a16bd1..a5e353b83 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,15 @@ -2015-07-28 Alexei Podtelezhnikov +2015-07-31 Werner Lemberg + + Define FT_LONG_MAX. + + * include/freetype/config/ftstdlib.h (FT_LONG_MAX): New macro. + * src/cff/cf2arrst.c (cf2_arrstack_setNumElements): Use it. + +2015-07-28 Alexei Podtelezhnikov * src/base/ftcalc.c (FT_Vector_NormLen): Clarify. -2015-07-27 Alexei Podtelezhnikov +2015-07-27 Alexei Podtelezhnikov * src/base/ftcalc.c (FT_Vector_NormLen): Explicate type conversions. diff --git a/include/freetype/config/ftstdlib.h b/include/freetype/config/ftstdlib.h index 8ef43c04b..4b471d4d1 100644 --- a/include/freetype/config/ftstdlib.h +++ b/include/freetype/config/ftstdlib.h @@ -64,6 +64,7 @@ #define FT_INT_MAX INT_MAX #define FT_INT_MIN INT_MIN #define FT_UINT_MAX UINT_MAX +#define FT_LONG_MAX LONG_MAX #define FT_ULONG_MAX ULONG_MAX diff --git a/src/cff/cf2arrst.c b/src/cff/cf2arrst.c index 528b1fa86..89f3e9f1d 100644 --- a/src/cff/cf2arrst.c +++ b/src/cff/cf2arrst.c @@ -104,7 +104,7 @@ size_t newSize = numElements * arrstack->sizeItem; - if ( numElements > LONG_MAX / arrstack->sizeItem ) + if ( numElements > FT_LONG_MAX / arrstack->sizeItem ) goto exit;