* include/freetype/internal/ftcalc.h: Add macros for handling
harmless over-/underflowing `FT_Int' values. * src/sfnt/sfdriver.c (fixed2float): Fix negation of `(int)(-2147483648)'. Reported as https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9423
This commit is contained in:
parent
839cb404cf
commit
fda356b742
12
ChangeLog
12
ChangeLog
|
@ -1,3 +1,15 @@
|
||||||
|
2018-07-16 Armin Hasitzka <prince.cherusker@gmail.com>
|
||||||
|
|
||||||
|
* include/freetype/internal/ftcalc.h: Add macros for handling
|
||||||
|
harmless over-/underflowing `FT_Int' values.
|
||||||
|
|
||||||
|
* src/sfnt/sfdriver.c (fixed2float): Fix negation of
|
||||||
|
`(int)(-2147483648)'.
|
||||||
|
|
||||||
|
Reported as
|
||||||
|
|
||||||
|
https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9423
|
||||||
|
|
||||||
2018-07-16 Werner Lemberg <wl@gnu.org>
|
2018-07-16 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
* src/truetype/ttgxvar.c (tt_set_mm_blend): Fix off-by-one error.
|
* src/truetype/ttgxvar.c (tt_set_mm_blend): Fix off-by-one error.
|
||||||
|
|
|
@ -462,6 +462,15 @@ FT_BEGIN_HEADER
|
||||||
*
|
*
|
||||||
* Use with care!
|
* Use with care!
|
||||||
*/
|
*/
|
||||||
|
#define ADD_INT( a, b ) \
|
||||||
|
(FT_Int)( (FT_UInt)(a) + (FT_UInt)(b) )
|
||||||
|
#define SUB_INT( a, b ) \
|
||||||
|
(FT_Int)( (FT_UInt)(a) - (FT_UInt)(b) )
|
||||||
|
#define MUL_INT( a, b ) \
|
||||||
|
(FT_Int)( (FT_UInt)(a) * (FT_UInt)(b) )
|
||||||
|
#define NEG_INT( a ) \
|
||||||
|
(FT_Int)( (FT_UInt)0 - (FT_UInt)(a) )
|
||||||
|
|
||||||
#define ADD_LONG( a, b ) \
|
#define ADD_LONG( a, b ) \
|
||||||
(FT_Long)( (FT_ULong)(a) + (FT_ULong)(b) )
|
(FT_Long)( (FT_ULong)(a) + (FT_ULong)(b) )
|
||||||
#define SUB_LONG( a, b ) \
|
#define SUB_LONG( a, b ) \
|
||||||
|
|
|
@ -677,7 +677,7 @@
|
||||||
if ( fixed < 0 )
|
if ( fixed < 0 )
|
||||||
{
|
{
|
||||||
*p++ = '-';
|
*p++ = '-';
|
||||||
fixed = -fixed;
|
fixed = NEG_INT( fixed );
|
||||||
}
|
}
|
||||||
|
|
||||||
int_part = ( fixed >> 16 ) & 0xFFFF;
|
int_part = ( fixed >> 16 ) & 0xFFFF;
|
||||||
|
|
Loading…
Reference in New Issue