diff options
| author | Owen Taylor <otaylor@redhat.com> | 2003-04-15 21:05:48 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2003-04-15 21:05:48 +0000 |
| commit | 5676f3b167815d2a32b40ceeec86cc096e123cbb (patch) | |
| tree | e6a8e10406fcdac83287450f4406d7ae812d9319 | |
| parent | f2a133be392d628cedf90fadf2d217cc73cc1ca5 (diff) | |
| download | pango-5676f3b167815d2a32b40ceeec86cc096e123cbb.tar.gz | |
Fix infinite loop in the case where the charmap contains a character >
Tue Apr 15 05:00:39 2003 Owen Taylor <otaylor@redhat.com>
* pango/opentype/pango-ot-info.c (synthesize_class_def):
Fix infinite loop in the case where the charmap contains
a character > 65535. (#106550, Morten Welinder.)
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 6 | ||||
| -rw-r--r-- | pango/opentype/pango-ot-info.c | 14 |
6 files changed, 37 insertions, 7 deletions
@@ -1,3 +1,9 @@ +Tue Apr 15 05:00:39 2003 Owen Taylor <otaylor@redhat.com> + + * pango/opentype/pango-ot-info.c (synthesize_class_def): + Fix infinite loop in the case where the charmap contains + a character > 65535. (#106550, Morten Welinder.) + Tue Apr 15 04:53:56 2003 Owen Taylor <otaylor@redhat.com> * modules/indic/indic-ot.h (enum): Cast some enumeration diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index ea748ed1..fc98cce4 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,9 @@ +Tue Apr 15 05:00:39 2003 Owen Taylor <otaylor@redhat.com> + + * pango/opentype/pango-ot-info.c (synthesize_class_def): + Fix infinite loop in the case where the charmap contains + a character > 65535. (#106550, Morten Welinder.) + Tue Apr 15 04:53:56 2003 Owen Taylor <otaylor@redhat.com> * modules/indic/indic-ot.h (enum): Cast some enumeration diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index ea748ed1..fc98cce4 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,9 @@ +Tue Apr 15 05:00:39 2003 Owen Taylor <otaylor@redhat.com> + + * pango/opentype/pango-ot-info.c (synthesize_class_def): + Fix infinite loop in the case where the charmap contains + a character > 65535. (#106550, Morten Welinder.) + Tue Apr 15 04:53:56 2003 Owen Taylor <otaylor@redhat.com> * modules/indic/indic-ot.h (enum): Cast some enumeration diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index ea748ed1..fc98cce4 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,9 @@ +Tue Apr 15 05:00:39 2003 Owen Taylor <otaylor@redhat.com> + + * pango/opentype/pango-ot-info.c (synthesize_class_def): + Fix infinite loop in the case where the charmap contains + a character > 65535. (#106550, Morten Welinder.) + Tue Apr 15 04:53:56 2003 Owen Taylor <otaylor@redhat.com> * modules/indic/indic-ot.h (enum): Cast some enumeration diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index ea748ed1..fc98cce4 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,9 @@ +Tue Apr 15 05:00:39 2003 Owen Taylor <otaylor@redhat.com> + + * pango/opentype/pango-ot-info.c (synthesize_class_def): + Fix infinite loop in the case where the charmap contains + a character > 65535. (#106550, Morten Welinder.) + Tue Apr 15 04:53:56 2003 Owen Taylor <otaylor@redhat.com> * modules/indic/indic-ot.h (enum): Cast some enumeration diff --git a/pango/opentype/pango-ot-info.c b/pango/opentype/pango-ot-info.c index 1a4251a3..1c55f2e0 100644 --- a/pango/opentype/pango-ot-info.c +++ b/pango/opentype/pango-ot-info.c @@ -202,13 +202,13 @@ synthesize_class_def (PangoOTInfo *info) { GlyphInfo glyph_info; - if (glyph > 65535) - continue; - - glyph_info.glyph = glyph; - glyph_info.class = get_glyph_class (charcode); - - g_array_append_val (glyph_infos, glyph_info); + if (glyph <= 65535) + { + glyph_info.glyph = glyph; + glyph_info.class = get_glyph_class (charcode); + + g_array_append_val (glyph_infos, glyph_info); + } charcode = FT_Get_Next_Char (info->face, charcode, &glyph); } |