minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 4 Releases Wiki Activity

[raster] Fix pool overflow checking. 

* src/raster/ftraster.c (New_Profile, End_Profile): Check for overflow
immediately.
(Convert_Glyph, Render_Single_Pass): Fix boundaries.
This commit is contained in:
Alexei Podtelezhnikov 2023-10-13 00:16:02 -04:00
parent 14bcb2867a
commit c7fa00bf4e
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/raster/ftraster.c
View File

@ -620,15 +620,16 @@
{
if ( !ras.fProfile )
{
ras.fProfile = (PProfile)ras.top;
ras.cProfile = (PProfile)ras.top;
ras.fProfile = ras.cProfile;
ras.top += AlignProfileSize;
}
if ( ras.top >= ras.maxBuff )
{
ras.error = FT_THROW( Raster_Overflow );
return FAILURE;
if ( ras.top >= ras.maxBuff )
{
FT_TRACE1(( "overflow in New_Profile\n" ));
ras.error = FT_THROW( Raster_Overflow );
return FAILURE;
}
}
ras.cProfile->start = 0;
@ -721,19 +722,19 @@
ras.top += AlignProfileSize;
if ( ras.top >= ras.maxBuff )
{
FT_TRACE1(( "overflow in End_Profile\n" ));
ras.error = FT_THROW( Raster_Overflow );
return FAILURE;
}
ras.cProfile->offset = ras.top;
ras.cProfile->height = 0;
ras.num_Profs++;
}
if ( ras.top >= ras.maxBuff )
{
FT_TRACE1(( "overflow in End_Profile\n" ));
ras.error = FT_THROW( Raster_Overflow );
return FAILURE;
}
ras.joint = FALSE;
return SUCCESS;
@ -1973,7 +1974,8 @@
ras.joint = FALSE;
ras.fresh = FALSE;
ras.maxBuff = ras.sizeBuff - AlignProfileSize;
ras.top = ras.buff;
ras.maxBuff = ras.sizeBuff;
ras.numTurns = 0;
ras.num_Profs = 0;
@ -3017,8 +3019,6 @@
ras.minY = (Long)y_min * ras.precision;
ras.maxY = (Long)y_max * ras.precision;
ras.top = ras.buff;
ras.error = Raster_Err_Ok;
if ( Convert_Glyph( RAS_VARS flipped ) )