src/cff/cffparse.c - Issue 89753003: Update freetype to latest version of ASOP.

Unified Diff: src/cff/cffparse.c

Issue 89753003: Update freetype to latest version of ASOP. (Closed) Base URL: https://chromium.googlesource.com/chromium/src/third_party/freetype.git@master

Patch Set: Created 7 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: src/cff/cffparse.c

diff --git a/src/cff/cffparse.c b/src/cff/cffparse.c

index 61fa87c8098802f411dc92ab67b92776d8200720..96222120b013e2290bc0561e59db1cc0db42656c 100644

--- a/src/cff/cffparse.c

+++ b/src/cff/cffparse.c

@@ -4,7 +4,7 @@

/* */

/* CFF token stream parser (body) */

/* */

/* David Turner, Robert Wilhelm, and Werner Lemberg. */

/* */

/* This file is part of the FreeType project, and may only be used, */

@@ -65,7 +65,7 @@

if ( p + 2 > limit )

goto Bad;

- val = (FT_Short)( ( (FT_Int)p[0] << 8 ) | p[1] );

+ val = (FT_Short)( ( (FT_UShort)p[0] << 8 ) | p[1] );

p += 2;

}

else if ( v == 29 )

@@ -73,10 +73,10 @@

if ( p + 4 > limit )

goto Bad;

- val = ( (FT_Long)p[0] << 24 ) |

- ( (FT_Long)p[1] << 16 ) |

- ( (FT_Long)p[2] << 8 ) |

- p[3];

+ val = (FT_Long)( ( (FT_ULong)p[0] << 24 ) |

+ ( (FT_ULong)p[1] << 16 ) |

+ ( (FT_ULong)p[2] << 8 ) |

+ (FT_ULong)p[3] );

p += 4;

}

else if ( v < 247 )

@@ -105,6 +105,7 @@

Bad:

val = 0;

+ FT_TRACE4(( "!!!END OF DATA:!!!" ));

goto Exit;

}

@@ -136,7 +137,7 @@

FT_UInt phase;

FT_Long result, number, exponent;

- FT_Int sign = 0, exponent_sign = 0;

+ FT_Int sign = 0, exponent_sign = 0, have_overflow = 0;

FT_Long exponent_add, integer_length, fraction_length;

@@ -165,7 +166,7 @@

/* Make sure we don't read past the end. */

if ( p >= limit )

- goto Exit;

+ goto Bad;

}

/* Get the nibble. */

@@ -202,7 +203,7 @@

/* Make sure we don't read past the end. */

if ( p >= limit )

- goto Exit;

+ goto Bad;

}

/* Get the nibble. */

@@ -241,7 +242,7 @@

/* Make sure we don't read past the end. */

if ( p >= limit )

- goto Exit;

+ goto Bad;

}

/* Get the nibble. */

@@ -250,17 +251,28 @@

if ( nib >= 10 )

break;

- exponent = exponent * 10 + nib;

/* Arbitrarily limit exponent. */

if ( exponent > 1000 )

- goto Exit;

+ have_overflow = 1;

+ else

+ exponent = exponent * 10 + nib;

}

if ( exponent_sign )

exponent = -exponent;

}

+ if ( !number )

+ goto Exit;

+ if ( have_overflow )

+ {

+ if ( exponent_sign )

+ goto Underflow;

+ else

+ goto Overflow;

+ }

/* We don't check `power_ten' and `exponent_add'. */

exponent += power_ten + exponent_add;

@@ -286,20 +298,25 @@

/* Make `scaling' as small as possible. */

new_fraction_length = FT_MIN( exponent, 5 );

- exponent -= new_fraction_length;

shift = new_fraction_length - fraction_length;

- number *= power_tens[shift];

- if ( number > 0x7FFFL )

+ if ( shift > 0 )

{

- number /= 10;

- exponent += 1;

+ exponent -= new_fraction_length;

+ number *= power_tens[shift];

+ if ( number > 0x7FFFL )

+ {

+ number /= 10;

+ exponent += 1;

+ }

}

+ else

+ exponent -= fraction_length;

}

else

exponent -= fraction_length;

- result = number << 16;

+ result = (FT_Long)( (FT_ULong)number << 16 );

*scaling = exponent;

}

@@ -322,9 +339,10 @@

integer_length += exponent;

fraction_length -= exponent;

- /* Check for overflow and underflow. */

- if ( FT_ABS( integer_length ) > 5 )

- goto Exit;

+ if ( integer_length > 5 )

+ goto Overflow;

+ if ( integer_length < -5 )

+ goto Underflow;

/* Remove non-significant digits. */

if ( integer_length < 0 )

@@ -353,17 +371,32 @@

number *= power_tens[-fraction_length];

if ( number > 0x7FFFL )

- goto Exit;

+ goto Overflow;

- result = number << 16;

+ result = (FT_Long)( (FT_ULong)number << 16 );

}

+ Exit:

if ( sign )

result = -result;

- Exit:

return result;

+ Overflow:

+ result = 0x7FFFFFFFL;

+ FT_TRACE4(( "!!!OVERFLOW:!!!" ));

+ goto Exit;

+ Underflow:

+ result = 0;

+ FT_TRACE4(( "!!!UNDERFLOW:!!!" ));

+ goto Exit;

+ Bad:

+ result = 0;

+ FT_TRACE4(( "!!!END OF DATA:!!!" ));

+ goto Exit;

}

@@ -378,10 +411,44 @@

/* read a floating point number, either integer or real */

static FT_Fixed

+ do_fixed( FT_Byte** d,

+ FT_Long scaling )

+ {

+ if ( **d == 30 )

+ return cff_parse_real( d[0], d[1], scaling, NULL );

+ else

+ {

+ FT_Long val = cff_parse_integer( d[0], d[1] );

+ if ( scaling )

+ val *= power_tens[scaling];

+ if ( val > 0x7FFF )

+ {

+ val = 0x7FFFFFFFL;

+ goto Overflow;

+ }

+ else if ( val < -0x7FFF )

+ {

+ val = -0x7FFFFFFFL;

+ goto Overflow;

+ }

+ return (FT_Long)( (FT_ULong)val << 16 );

+ Overflow:

+ FT_TRACE4(( "!!!OVERFLOW:!!!" ));

+ return val;

+ }

+ /* read a floating point number, either integer or real */

+ static FT_Fixed

cff_parse_fixed( FT_Byte** d )

{

- return **d == 30 ? cff_parse_real( d[0], d[1], 0, NULL )

- : cff_parse_integer( d[0], d[1] ) << 16;

+ return do_fixed( d, 0 );

}

@@ -391,9 +458,7 @@

cff_parse_fixed_scaled( FT_Byte** d,

FT_Long scaling )

{

- return **d == 30 ? cff_parse_real( d[0], d[1], scaling, NULL )

- : ( cff_parse_integer( d[0], d[1] ) *

- power_tens[scaling] ) << 16;

+ return do_fixed( d, scaling );

}

@@ -436,7 +501,7 @@

else

{

*scaling = 0;

- return number << 16;

+ return (FT_Long)( (FT_ULong)number << 16 );

}

@@ -450,7 +515,7 @@

FT_Vector* offset = &dict->font_offset;

FT_ULong* upm = &dict->units_per_em;

FT_Byte** data = parser->stack;

- FT_Error error = CFF_Err_Stack_Underflow;

+ FT_Error error = FT_ERR( Stack_Underflow );

if ( parser->top >= parser->stack + 6 )

@@ -458,7 +523,7 @@

FT_Long scaling;

- error = CFF_Err_Ok;

+ error = FT_Err_Ok;

dict->has_font_matrix = TRUE;

@@ -523,7 +588,7 @@

FT_Error error;

- error = CFF_Err_Stack_Underflow;

+ error = FT_ERR( Stack_Underflow );

if ( parser->top >= parser->stack + 4 )

{

@@ -531,7 +596,7 @@

bbox->yMin = FT_RoundFix( cff_parse_fixed( data++ ) );

bbox->xMax = FT_RoundFix( cff_parse_fixed( data++ ) );

bbox->yMax = FT_RoundFix( cff_parse_fixed( data ) );

- error = CFF_Err_Ok;

+ error = FT_Err_Ok;

FT_TRACE4(( " [%d %d %d %d]\n",

bbox->xMin / 65536,

@@ -552,7 +617,7 @@

FT_Error error;

- error = CFF_Err_Stack_Underflow;

+ error = FT_ERR( Stack_Underflow );

if ( parser->top >= parser->stack + 2 )

{

@@ -561,7 +626,7 @@

FT_TRACE4(( " %lu %lu\n",

dict->private_size, dict->private_offset ));

- error = CFF_Err_Ok;

+ error = FT_Err_Ok;

}

return error;

@@ -576,7 +641,7 @@

FT_Error error;

- error = CFF_Err_Stack_Underflow;

+ error = FT_ERR( Stack_Underflow );

if ( parser->top >= parser->stack + 3 )

{

@@ -588,7 +653,7 @@

if ( dict->cid_supplement < 0 )

FT_TRACE1(( "cff_parse_cid_ros: negative supplement %d is found\n",

dict->cid_supplement ));

- error = CFF_Err_Ok;

+ error = FT_Err_Ok;

FT_TRACE4(( " %d %d %d\n",

dict->cid_registry,

@@ -730,7 +795,7 @@

FT_Create_Class_cff_field_handlers( FT_Library library,

CFF_Field_Handler** output_class )

{

- CFF_Field_Handler* clazz;

+ CFF_Field_Handler* clazz = NULL;

FT_Error error;

FT_Memory memory = library->memory;

@@ -857,7 +922,7 @@

*output_class = clazz;

- return CFF_Err_Ok;

+ return FT_Err_Ok;

}

@@ -870,7 +935,7 @@

FT_Byte* limit )

{

FT_Byte* p = start;

- FT_Error error = CFF_Err_Ok;

+ FT_Error error = FT_Err_Ok;

FT_Library library = parser->library;

FT_UNUSED( library );

@@ -944,7 +1009,7 @@

}

code = code | parser->object_code;

- for ( field = FT_CFF_FIELD_HANDLERS_GET; field->kind; field++ )

+ for ( field = CFF_FIELD_HANDLERS_GET; field->kind; field++ )

{

if ( field->code == (FT_Int)code )

{

@@ -1096,15 +1161,15 @@

return error;

Stack_Overflow:

- error = CFF_Err_Invalid_Argument;

+ error = FT_THROW( Invalid_Argument );

goto Exit;

Stack_Underflow:

- error = CFF_Err_Invalid_Argument;

+ error = FT_THROW( Invalid_Argument );

goto Exit;

Syntax_Error:

- error = CFF_Err_Invalid_Argument;

+ error = FT_THROW( Invalid_Argument );

goto Exit;

}

« no previous file with comments | « src/cff/cffobjs.c ('k') | src/cff/cffpic.h » ('j') | no next file with comments »