From 3037b069f8574be3841c9f9d9ca5701e2dce881d Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Sat, 26 Jun 2004 07:03:53 +0000 Subject: [PATCH] * src/type1/t1afm.c (afm_atoindex): Fix boundary test. Reported by Dirck Blaskey. --- ChangeLog | 5 +++++ src/type1/t1afm.c | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7d50f0c49..e7ccf7a55 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-06-25 Werner Lemberg + + * src/type1/t1afm.c (afm_atoindex): Fix boundary test. Reported + by Dirck Blaskey. + 2004-06-24 David Turner * src/truetype/ttgload.c, src/truetype/ttxgvar.c: removing diff --git a/src/type1/t1afm.c b/src/type1/t1afm.c index 9945ebdf6..65d86fab3 100644 --- a/src/type1/t1afm.c +++ b/src/type1/t1afm.c @@ -4,7 +4,7 @@ /* */ /* AFM support for Type 1 fonts (body). */ /* */ -/* Copyright 1996-2001, 2002, 2003 by */ +/* Copyright 1996-2001, 2002, 2003, 2004 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -63,13 +63,13 @@ /* skip whitespace */ - while ( ( *p == ' ' || *p == '\t' || *p == ':' || *p == ';' ) && - p < limit ) + while ( p < limit && + ( *p == ' ' || *p == '\t' || *p == ':' || *p == ';' ) ) p++; *start = p; /* now, read glyph name */ - while ( IS_ALPHANUM( *p ) && p < limit ) + while ( p < limit && IS_ALPHANUM( *p ) ) p++; len = p - *start;