1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253 |
- --- freetype-2.3.11/src/psaux/psconv.c 2009-07-31 18:45:18.000000000 +0200
- +++ freetype-2.3.11/src/psaux/psconv.c 2012-03-28 10:55:16.000000000 +0200
- @@ -4,7 +4,7 @@
- /* */
- /* Some convenience conversions (body). */
- /* */
- -/* Copyright 2006, 2008, 2009 by */
- +/* Copyright 2006, 2008, 2009, 2012 by */
- /* David Turner, Robert Wilhelm, and Werner Lemberg. */
- /* */
- /* This file is part of the FreeType project, and may only be used, */
- @@ -79,7 +79,7 @@
- FT_Bool sign = 0;
-
-
- - if ( p == limit || base < 2 || base > 36 )
- + if ( p >= limit || base < 2 || base > 36 )
- return 0;
-
- if ( *p == '-' || *p == '+' )
- @@ -150,7 +150,7 @@
- FT_Bool sign = 0;
-
-
- - if ( p == limit )
- + if ( p >= limit )
- return 0;
-
- if ( *p == '-' || *p == '+' )
- @@ -346,7 +346,11 @@
-
- #if 1
-
- - p = *cursor;
- + p = *cursor;
- +
- + if ( p >= limit )
- + return 0;
- +
- if ( n > (FT_UInt)( limit - p ) )
- n = (FT_UInt)( limit - p );
-
- @@ -434,6 +438,10 @@
- #if 1
-
- p = *cursor;
- +
- + if ( p >= limit )
- + return 0;
- +
- if ( n > (FT_UInt)(limit - p) )
- n = (FT_UInt)(limit - p);
-
|