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

* src/pfr/pfrgload.c (pfr_glyph_done): Comment out unused code. 

(pfr_glyph_load_simple): Convert assertion into normal FreeType
error.
Check `idx'.
(pfr_glyph_load_compound): Convert assertion into normal FreeType
error.

* src/pfr/pfrtypes.h (PFR_GlyphRec): Comment out unused code.
This commit is contained in:
Werner Lemberg 2007-06-05 05:27:54 +00:00
parent ad18b367e9
commit 6c05475d50
3 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2007-06-05 Werner Lemberg <wl@gnu.org>
* src/pfr/pfrgload.c (pfr_glyph_done): Comment out unused code.
(pfr_glyph_load_simple): Convert assertion into normal FreeType
error.
Check `idx'.
(pfr_glyph_load_compound): Convert assertion into normal FreeType
error.
* src/pfr/pfrtypes.h (PFR_GlyphRec): Comment out unused code.
2007-06-04 Werner Lemberg <wl@gnu.org>
* src/cid/cidgload.c (cid_load_glyph): Check `fd_select'.

22
src/pfr/pfrgload.c
View File

@ -4,7 +4,7 @@
/* */
/* FreeType PFR glyph loader (body). */
/* */
/* Copyright 2002, 2003, 2005 by */
/* Copyright 2002, 2003, 2005, 2007 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -59,8 +59,10 @@
glyph->y_control = NULL;
glyph->max_xy_control = 0;
#if 0
glyph->num_x_control = 0;
glyph->num_y_control = 0;
#endif
FT_FREE( glyph->subs );
@ -244,7 +246,8 @@
flags = PFR_NEXT_BYTE( p );
/* test for composite glyphs */
FT_ASSERT( ( flags & PFR_GLYPH_IS_COMPOUND ) == 0 );
if ( flags & PFR_GLYPH_IS_COMPOUND )
goto Failure;
x_count = 0;
y_count = 0;
@ -410,7 +413,8 @@
cur = pos;
for ( n = 0; n < args_count; n++ )
{
FT_Int idx, delta;
FT_UInt idx;
FT_Int delta;
/* read the X argument */
@ -419,6 +423,8 @@
case 0: /* 8-bit index */
PFR_CHECK( 1 );
idx = PFR_NEXT_BYTE( p );
if ( idx > x_count )
goto Failure;
cur->x = glyph->x_control[idx];
FT_TRACE7(( " cx#%d", idx ));
break;
@ -447,6 +453,8 @@
case 0: /* 8-bit index */
PFR_CHECK( 1 );
idx = PFR_NEXT_BYTE( p );
if ( idx > y_count )
goto Failure;
cur->y = glyph->y_control[idx];
FT_TRACE7(( " cy#%d", idx ));
break;
@ -519,6 +527,7 @@
Exit:
return error;
Failure:
Too_Short:
error = PFR_Err_Invalid_Table;
FT_ERROR(( "pfr_glyph_load_simple: invalid glyph data\n" ));
@ -544,7 +553,8 @@
flags = PFR_NEXT_BYTE( p );
/* test for composite glyphs */
FT_ASSERT( ( flags & PFR_GLYPH_IS_COMPOUND ) != 0 );
if ( !( flags & PFR_GLYPH_IS_COMPOUND ) )
goto Failure;
count = flags & 0x3F;
@ -670,6 +680,7 @@
Exit:
return error;
Failure:
Too_Short:
error = PFR_Err_Invalid_Table;
FT_ERROR(( "pfr_glyph_load_compound: invalid glyph data\n" ));
@ -677,9 +688,6 @@
}
static FT_Error
pfr_glyph_load_rec( PFR_Glyph glyph,
FT_Stream stream,

4
src/pfr/pfrtypes.h
View File

@ -4,7 +4,7 @@
/* */
/* FreeType PFR data structures (specification only). */
/* */
/* Copyright 2002, 2003, 2005 by */
/* Copyright 2002, 2003, 2005, 2007 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -335,8 +335,10 @@ FT_BEGIN_HEADER
{
FT_Byte format;
#if 0
FT_UInt num_x_control;
FT_UInt num_y_control;
#endif
FT_UInt max_xy_control;
FT_Pos* x_control;
FT_Pos* y_control;