summaryrefslogtreecommitdiff
path: root/src/cff
diff options
context:
space:
mode:
authorWerner Lemberg <wl@gnu.org>2017-06-05 06:20:53 +0200
committerWerner Lemberg <wl@gnu.org>2017-06-05 06:20:53 +0200
commit8667042997cb9095d3c925417b29f5a3163ab352 (patch)
tree4a59bc1f79ab19ae03652a3e7704599591c947bd /src/cff
parent9fa8a2997f869c6172a12a9497b3ca649806ec4d (diff)
downloadfreetype2-8667042997cb9095d3c925417b29f5a3163ab352.tar.gz
[cff] Integer overflow.
Reported as https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2089 * src/cff/cffload.c (cff_blend_doBlend): User OVERFLOW_ADD_INT32.
Diffstat (limited to 'src/cff')
-rw-r--r--src/cff/cffload.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/cff/cffload.c b/src/cff/cffload.c
index 3beaeb1c8..2ee438755 100644
--- a/src/cff/cffload.c
+++ b/src/cff/cffload.c
@@ -1352,9 +1352,12 @@
sum = cff_parse_num( parser, &parser->stack[i + base] ) * 65536;
for ( j = 1; j < blend->lenBV; j++ )
- sum += FT_MulFix( *weight++,
- cff_parse_num( parser,
- &parser->stack[delta++] ) * 65536 );
+ sum = OVERFLOW_ADD_INT32(
+ sum,
+ FT_MulFix(
+ *weight++,
+ cff_parse_num( parser,
+ &parser->stack[delta++] ) * 65536 ) );
/* point parser stack to new value on blend_stack */
parser->stack[i + base] = subFont->blend_top;