From 49c7df604e7b84310da42c9431ca96818d440b1b Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Thu, 10 Jan 2002 21:28:47 +0000 Subject: Fix read of unitialized memory (#66067, Hidetoshi Tajima) Thu Jan 10 16:27:24 2002 Owen Taylor * pango/mini-fribidi/fribidi.c: Fix read of unitialized memory (#66067, Hidetoshi Tajima) --- ChangeLog | 5 +++++ ChangeLog.pre-1-0 | 5 +++++ ChangeLog.pre-1-10 | 5 +++++ ChangeLog.pre-1-2 | 5 +++++ ChangeLog.pre-1-4 | 5 +++++ ChangeLog.pre-1-6 | 5 +++++ ChangeLog.pre-1-8 | 5 +++++ pango/mini-fribidi/fribidi.c | 2 +- 8 files changed, 36 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index caed40a8..12200222 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Jan 10 16:27:24 2002 Owen Taylor + + * pango/mini-fribidi/fribidi.c: Fix read of unitialized + memory (#66067, Hidetoshi Tajima) + Thu Jan 10 15:04:31 2002 Owen Taylor * pango/glyphstring.c (pango_glyph_string_extents_range): diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0 index caed40a8..12200222 100644 --- a/ChangeLog.pre-1-0 +++ b/ChangeLog.pre-1-0 @@ -1,3 +1,8 @@ +Thu Jan 10 16:27:24 2002 Owen Taylor + + * pango/mini-fribidi/fribidi.c: Fix read of unitialized + memory (#66067, Hidetoshi Tajima) + Thu Jan 10 15:04:31 2002 Owen Taylor * pango/glyphstring.c (pango_glyph_string_extents_range): diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index caed40a8..12200222 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,8 @@ +Thu Jan 10 16:27:24 2002 Owen Taylor + + * pango/mini-fribidi/fribidi.c: Fix read of unitialized + memory (#66067, Hidetoshi Tajima) + Thu Jan 10 15:04:31 2002 Owen Taylor * pango/glyphstring.c (pango_glyph_string_extents_range): diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index caed40a8..12200222 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,8 @@ +Thu Jan 10 16:27:24 2002 Owen Taylor + + * pango/mini-fribidi/fribidi.c: Fix read of unitialized + memory (#66067, Hidetoshi Tajima) + Thu Jan 10 15:04:31 2002 Owen Taylor * pango/glyphstring.c (pango_glyph_string_extents_range): diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index caed40a8..12200222 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,8 @@ +Thu Jan 10 16:27:24 2002 Owen Taylor + + * pango/mini-fribidi/fribidi.c: Fix read of unitialized + memory (#66067, Hidetoshi Tajima) + Thu Jan 10 15:04:31 2002 Owen Taylor * pango/glyphstring.c (pango_glyph_string_extents_range): diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index caed40a8..12200222 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,8 @@ +Thu Jan 10 16:27:24 2002 Owen Taylor + + * pango/mini-fribidi/fribidi.c: Fix read of unitialized + memory (#66067, Hidetoshi Tajima) + Thu Jan 10 15:04:31 2002 Owen Taylor * pango/glyphstring.c (pango_glyph_string_extents_range): diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index caed40a8..12200222 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,8 @@ +Thu Jan 10 16:27:24 2002 Owen Taylor + + * pango/mini-fribidi/fribidi.c: Fix read of unitialized + memory (#66067, Hidetoshi Tajima) + Thu Jan 10 15:04:31 2002 Owen Taylor * pango/glyphstring.c (pango_glyph_string_extents_range): diff --git a/pango/mini-fribidi/fribidi.c b/pango/mini-fribidi/fribidi.c index ec3900e4..e8c4c10f 100644 --- a/pango/mini-fribidi/fribidi.c +++ b/pango/mini-fribidi/fribidi.c @@ -150,7 +150,7 @@ run_length_encode_types (FriBidiCharType *char_type, gint type_len) current.pos = -1; for (i = 0; i <= type_len; i++) { - if (char_type[i] != current.type || i == type_len) + if (i == type_len || char_type[i] != current.type) { if (current.pos >= 0) { -- cgit v1.2.1