Fix Savannah bug #38970.

* src/base/ftdebug.c, builds/win32/ftdebug.c,
builds/wince/ftdebug.c, builds/amiga/src/base/ftdebug.c
(ft_debug_init): Don't read past the environment variable FT2_DEBUG.
This commit is contained in:
Brian Nixon 2013-05-13 09:06:42 +02:00 committed by Werner Lemberg
parent cd888753c8
commit 8d6025c8da
5 changed files with 24 additions and 4 deletions

View File

@ -1,3 +1,11 @@
2013-05-13 Brian Nixon <bnixon@yahoo.com>
Fix Savannah bug #38970.
* src/base/ftdebug.c, builds/win32/ftdebug.c,
builds/wince/ftdebug.c, builds/amiga/src/base/ftdebug.c
(ft_debug_init): Don't read past the environment variable FT2_DEBUG.
2013-05-12 Werner Lemberg <wl@gnu.org> 2013-05-12 Werner Lemberg <wl@gnu.org>
[truetype] Add framework for TrueType properties. [truetype] Add framework for TrueType properties.

View File

@ -208,6 +208,9 @@
while ( *p && *p != ':' ) while ( *p && *p != ':' )
p++; p++;
if ( !*p )
break;
if ( *p == ':' && p > q ) if ( *p == ':' && p > q )
{ {
FT_Int n, i, len = (FT_Int)( p - q ); FT_Int n, i, len = (FT_Int)( p - q );
@ -236,7 +239,7 @@
p++; p++;
if ( *p ) if ( *p )
{ {
level = *p++ - '0'; level = *p - '0';
if ( level < 0 || level > 7 ) if ( level < 0 || level > 7 )
level = -1; level = -1;
} }

View File

@ -166,6 +166,9 @@
while ( *p && *p != ':' ) while ( *p && *p != ':' )
p++; p++;
if ( !*p )
break;
if ( *p == ':' && p > q ) if ( *p == ':' && p > q )
{ {
int n, i, len = p - q; int n, i, len = p - q;
@ -194,7 +197,7 @@
p++; p++;
if ( *p ) if ( *p )
{ {
level = *p++ - '0'; level = *p - '0';
if ( level < 0 || level > 7 ) if ( level < 0 || level > 7 )
level = -1; level = -1;
} }

View File

@ -184,6 +184,9 @@
while ( *p && *p != ':' ) while ( *p && *p != ':' )
p++; p++;
if ( !*p )
break;
if ( *p == ':' && p > q ) if ( *p == ':' && p > q )
{ {
int n, i, len = p - q; int n, i, len = p - q;
@ -212,7 +215,7 @@
p++; p++;
if ( *p ) if ( *p )
{ {
level = *p++ - '0'; level = *p - '0';
if ( level < 0 || level > 7 ) if ( level < 0 || level > 7 )
level = -1; level = -1;
} }

View File

@ -181,6 +181,9 @@
while ( *p && *p != ':' ) while ( *p && *p != ':' )
p++; p++;
if ( !*p )
break;
if ( *p == ':' && p > q ) if ( *p == ':' && p > q )
{ {
FT_Int n, i, len = (FT_Int)( p - q ); FT_Int n, i, len = (FT_Int)( p - q );
@ -209,7 +212,7 @@
p++; p++;
if ( *p ) if ( *p )
{ {
level = *p++ - '0'; level = *p - '0';
if ( level < 0 || level > 7 ) if ( level < 0 || level > 7 )
level = -1; level = -1;
} }