Commit 3c64af98ffa03312ee36809e1fe0a08cb844d4f8
2016-06-20T00:01:55
[smooth] Sanitize memory managenent. * src/smooth/ftgrays.c (gray_convert_glyph): Cleaned up.
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 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66
diff --git a/ChangeLog b/ChangeLog
index 9bcf0ee..0f98d59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-06-20 Alexei Podtelezhnikov <apodtele@gmail.com>
+
+ [smooth] Sanitize memory managenent.
+
+ * src/smooth/ftgrays.c (gray_convert_glyph): Cleaned up.
+
2016-06-18 Alexei Podtelezhnikov <apodtele@gmail.com>
[smooth] Remove `band_shoot' that never worked.
diff --git a/src/smooth/ftgrays.c b/src/smooth/ftgrays.c
index a78a122..aef6a47 100644
--- a/src/smooth/ftgrays.c
+++ b/src/smooth/ftgrays.c
@@ -1937,34 +1937,26 @@ typedef ptrdiff_t FT_PtrDist;
TPos bottom, top, middle;
int error;
- {
- PCell cells_max;
- int yindex;
- long cell_start, cell_end, cell_mod;
-
- ras.ycells = (PCell*)ras.buffer;
- ras.ycount = band->max - band->min;
+ /* memory management */
+ {
+ int ycount = band->max - band->min;
+ int cell_start;
- cell_start = (long)sizeof ( PCell ) * ras.ycount;
- cell_mod = cell_start % (long)sizeof ( TCell );
- if ( cell_mod > 0 )
- cell_start += (long)sizeof ( TCell ) - cell_mod;
- cell_end = ras.buffer_size;
- cell_end -= cell_end % (long)sizeof ( TCell );
+ cell_start = ( ycount * sizeof( PCell ) + sizeof( TCell ) - 1 ) /
+ sizeof( TCell );
- cells_max = (PCell)( (char*)ras.buffer + cell_end );
- ras.cells = (PCell)( (char*)ras.buffer + cell_start );
- if ( ras.cells >= cells_max )
+ if ( FT_MAX_GRAY_POOL - cell_start < 2 )
goto ReduceBands;
- ras.max_cells = cells_max - ras.cells;
- if ( ras.max_cells < 2 )
- goto ReduceBands;
+ ras.cells = (PCell)ras.buffer + cell_start;
+ ras.max_cells = FT_MAX_GRAY_POOL - cell_start;
- for ( yindex = 0; yindex < ras.ycount; yindex++ )
- ras.ycells[yindex] = NULL;
+ ras.ycells = (PCell*)ras.buffer;
+ ras.ycount = ycount;
+ while ( ycount )
+ ras.ycells[--ycount] = NULL;
}
ras.num_cells = 0;