* src/base/ftoutln.c (FT_Outline_Get_Orientation): Fix overflow (#46149).
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47
diff --git a/ChangeLog b/ChangeLog
index a3c7ac1..4bfbe61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-10-10 Alexei Podtelezhnikov <apodtele@gmail.com>
+
+ * src/base/ftoutln.c (FT_Outline_Get_Orientation): Fix overflow
+ (#46149).
+
2015-10-10 Werner Lemberg <wl@gnu.org>
[sfnt] Fix infinite loops with broken cmaps (#46167).
@@ -72,7 +77,7 @@
* src/tools/ftfuzzer/ftfuzzer.cc, src/tools/runinput.cc: New files.
-2015-10-01 Alexei Podtelezhnikov <apodtele@gmail.com>
+2015-10-06 Alexei Podtelezhnikov <apodtele@gmail.com>
[smooth] Faster alternative line renderer.
diff --git a/src/base/ftoutln.c b/src/base/ftoutln.c
index 35cc9f5..34cf74e 100644
--- a/src/base/ftoutln.c
+++ b/src/base/ftoutln.c
@@ -1074,13 +1074,16 @@
FT_Int last = outline->contours[c];
- v_prev = points[last];
+ v_prev.x = points[last].x >> xshift;
+ v_prev.y = points[last].y >> yshift;
for ( n = first; n <= last; n++ )
{
- v_cur = points[n];
- area += ( ( v_cur.y - v_prev.y ) >> yshift ) *
- ( ( v_cur.x + v_prev.x ) >> xshift );
+ v_cur.x = points[n].x >> xshift;
+ v_cur.y = points[n].y >> yshift;
+
+ area += ( v_cur.y - v_prev.y ) * ( v_cur.x + v_prev.x );
+
v_prev = v_cur;
}