diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ChangeLog.pre-1-10 | 5 | ||||
-rw-r--r-- | ChangeLog.pre-1-4 | 5 | ||||
-rw-r--r-- | ChangeLog.pre-1-6 | 5 | ||||
-rw-r--r-- | ChangeLog.pre-1-8 | 5 | ||||
-rw-r--r-- | pango/pango-markup.c | 42 |
6 files changed, 55 insertions, 12 deletions
@@ -1,3 +1,8 @@ +Tue Feb 10 14:33:54 2004 Owen Taylor <otaylor@redhat.com> + + * pango/pango-markup.c: Handle 'tag' being NULL + in a bunch of places. (#122844, Noah Levitt) + Tue Feb 10 14:28:41 2004 Owen Taylor <otaylor@redhat.com> * pango/pango-context.c (update_attr_iterator): Fix diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 8451fb3c..f29a3524 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,8 @@ +Tue Feb 10 14:33:54 2004 Owen Taylor <otaylor@redhat.com> + + * pango/pango-markup.c: Handle 'tag' being NULL + in a bunch of places. (#122844, Noah Levitt) + Tue Feb 10 14:28:41 2004 Owen Taylor <otaylor@redhat.com> * pango/pango-context.c (update_attr_iterator): Fix diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 8451fb3c..f29a3524 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,8 @@ +Tue Feb 10 14:33:54 2004 Owen Taylor <otaylor@redhat.com> + + * pango/pango-markup.c: Handle 'tag' being NULL + in a bunch of places. (#122844, Noah Levitt) + Tue Feb 10 14:28:41 2004 Owen Taylor <otaylor@redhat.com> * pango/pango-context.c (update_attr_iterator): Fix diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 8451fb3c..f29a3524 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,8 @@ +Tue Feb 10 14:33:54 2004 Owen Taylor <otaylor@redhat.com> + + * pango/pango-markup.c: Handle 'tag' being NULL + in a bunch of places. (#122844, Noah Levitt) + Tue Feb 10 14:28:41 2004 Owen Taylor <otaylor@redhat.com> * pango/pango-context.c (update_attr_iterator): Fix diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 8451fb3c..f29a3524 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,8 @@ +Tue Feb 10 14:33:54 2004 Owen Taylor <otaylor@redhat.com> + + * pango/pango-markup.c: Handle 'tag' being NULL + in a bunch of places. (#122844, Noah Levitt) + Tue Feb 10 14:28:41 2004 Owen Taylor <otaylor@redhat.com> * pango/pango-context.c (update_attr_iterator): Fix diff --git a/pango/pango-markup.c b/pango/pango-markup.c index df139d97..a0697380 100644 --- a/pango/pango-markup.c +++ b/pango/pango-markup.c @@ -767,8 +767,11 @@ big_parse_func (MarkupData *md, CHECK_NO_ATTRS("big"); /* Grow text one level */ - tag->scale_level_delta += 1; - tag->scale_level += 1; + if (tag) + { + tag->scale_level_delta += 1; + tag->scale_level += 1; + } return TRUE; } @@ -989,13 +992,19 @@ span_parse_func (MarkupData *md, } else if (strcmp (size, "smaller") == 0) { - tag->scale_level_delta -= 1; - tag->scale_level -= 1; + if (tag) + { + tag->scale_level_delta -= 1; + tag->scale_level -= 1; + } } else if (strcmp (size, "larger") == 0) { - tag->scale_level_delta += 1; - tag->scale_level += 1; + if (tag) + { + tag->scale_level_delta += 1; + tag->scale_level += 1; + } } else if (parse_absolute_size (tag, size)) ; /* nothing */ @@ -1262,8 +1271,11 @@ sub_parse_func (MarkupData *md, CHECK_NO_ATTRS("sub"); /* Shrink font, and set a negative rise */ - tag->scale_level_delta -= 1; - tag->scale_level -= 1; + if (tag) + { + tag->scale_level_delta -= 1; + tag->scale_level -= 1; + } add_attribute (tag, pango_attr_rise_new (-SUPERSUB_RISE)); @@ -1281,8 +1293,11 @@ sup_parse_func (MarkupData *md, CHECK_NO_ATTRS("sup"); /* Shrink font, and set a positive rise */ - tag->scale_level_delta -= 1; - tag->scale_level -= 1; + if (tag) + { + tag->scale_level_delta -= 1; + tag->scale_level -= 1; + } add_attribute (tag, pango_attr_rise_new (SUPERSUB_RISE)); @@ -1300,8 +1315,11 @@ small_parse_func (MarkupData *md, CHECK_NO_ATTRS("small"); /* Shrink text one level */ - tag->scale_level_delta -= 1; - tag->scale_level -= 1; + if (tag) + { + tag->scale_level_delta -= 1; + tag->scale_level -= 1; + } return TRUE; } |