* src/cache/ftcmanag.c (FTC_Manager_Lookup_Size): prevent crashes
in Mozilla/FireFox print preview in Ubuntu Hoary
This commit is contained in:
parent
91a3faaac9
commit
65b96aad1e
|
@ -1,3 +1,8 @@
|
||||||
|
2006-03-06 David Turner <david@freetype.org>
|
||||||
|
|
||||||
|
* src/cache/ftcmanag.c (FTC_Manager_Lookup_Size): prevent crashes
|
||||||
|
in Mozilla/FireFox print preview in Ubuntu Hoary
|
||||||
|
|
||||||
2006-02-28 Chia-I Wu <b90201047@ntu.edu.tw>
|
2006-02-28 Chia-I Wu <b90201047@ntu.edu.tw>
|
||||||
|
|
||||||
* src/base/ftutil.c (ft_mem_qalloc) [FT_STRICT_ALIASING]: Do not
|
* src/base/ftutil.c (ft_mem_qalloc) [FT_STRICT_ALIASING]: Do not
|
||||||
|
|
|
@ -698,6 +698,7 @@
|
||||||
FTC_ScalerRec scaler;
|
FTC_ScalerRec scaler;
|
||||||
FT_Error error;
|
FT_Error error;
|
||||||
FT_Size size;
|
FT_Size size;
|
||||||
|
FT_Face face;
|
||||||
|
|
||||||
|
|
||||||
scaler.face_id = font->face_id;
|
scaler.face_id = font->face_id;
|
||||||
|
@ -710,14 +711,17 @@
|
||||||
error = FTC_Manager_LookupSize( manager, &scaler, &size );
|
error = FTC_Manager_LookupSize( manager, &scaler, &size );
|
||||||
if ( error )
|
if ( error )
|
||||||
{
|
{
|
||||||
*aface = NULL;
|
face = NULL;
|
||||||
*asize = NULL;
|
size = NULL;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
face = size->face;
|
||||||
*aface = size->face;
|
|
||||||
|
if ( aface )
|
||||||
|
*aface = face;
|
||||||
|
|
||||||
|
if ( asize )
|
||||||
*asize = size;
|
*asize = size;
|
||||||
}
|
|
||||||
|
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue