diff options
| author | Matthias Warkus <mawarkus@src.gnome.org> | 2002-07-02 17:15:24 +0000 |
|---|---|---|
| committer | Matthias Warkus <mawarkus@src.gnome.org> | 2002-07-02 17:15:24 +0000 |
| commit | 325238c642d9f89a4e46df6cf1bd6c9942097c1b (patch) | |
| tree | cb9638a9811f5962e239135c47abecc5d2e3066c | |
| parent | 97fa7cb97b669d91117862cefce3caa0eb7c366d (diff) | |
| download | pango-325238c642d9f89a4e46df6cf1bd6c9942097c1b.tar.gz | |
Fixed segfault, see ChangeLog
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-2 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 7 | ||||
| -rw-r--r-- | pango/pango-markup.c | 2 |
7 files changed, 43 insertions, 1 deletions
@@ -1,3 +1,10 @@ +2002-07-02 Matthias Warkus <mawarkus@gnome.org> + + * pango/pango-markup.c (span_parse_func): Fixed typo that was + causing markup with <span rise="..."> attributes to + segfault. Permission to commit to HEAD and stable branch granted + by Owen Taylor. + Sat Jun 15 23:26:41 2002 Owen Taylor <otaylor@redhat.com> * modules/arabic/arabic-ot.c: Support new Arabic diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 3e764afc..257de9d6 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,10 @@ +2002-07-02 Matthias Warkus <mawarkus@gnome.org> + + * pango/pango-markup.c (span_parse_func): Fixed typo that was + causing markup with <span rise="..."> attributes to + segfault. Permission to commit to HEAD and stable branch granted + by Owen Taylor. + Sat Jun 15 23:26:41 2002 Owen Taylor <otaylor@redhat.com> * modules/arabic/arabic-ot.c: Support new Arabic diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index 3e764afc..257de9d6 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,10 @@ +2002-07-02 Matthias Warkus <mawarkus@gnome.org> + + * pango/pango-markup.c (span_parse_func): Fixed typo that was + causing markup with <span rise="..."> attributes to + segfault. Permission to commit to HEAD and stable branch granted + by Owen Taylor. + Sat Jun 15 23:26:41 2002 Owen Taylor <otaylor@redhat.com> * modules/arabic/arabic-ot.c: Support new Arabic diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 3e764afc..257de9d6 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,10 @@ +2002-07-02 Matthias Warkus <mawarkus@gnome.org> + + * pango/pango-markup.c (span_parse_func): Fixed typo that was + causing markup with <span rise="..."> attributes to + segfault. Permission to commit to HEAD and stable branch granted + by Owen Taylor. + Sat Jun 15 23:26:41 2002 Owen Taylor <otaylor@redhat.com> * modules/arabic/arabic-ot.c: Support new Arabic diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 3e764afc..257de9d6 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,10 @@ +2002-07-02 Matthias Warkus <mawarkus@gnome.org> + + * pango/pango-markup.c (span_parse_func): Fixed typo that was + causing markup with <span rise="..."> attributes to + segfault. Permission to commit to HEAD and stable branch granted + by Owen Taylor. + Sat Jun 15 23:26:41 2002 Owen Taylor <otaylor@redhat.com> * modules/arabic/arabic-ot.c: Support new Arabic diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 3e764afc..257de9d6 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,10 @@ +2002-07-02 Matthias Warkus <mawarkus@gnome.org> + + * pango/pango-markup.c (span_parse_func): Fixed typo that was + causing markup with <span rise="..."> attributes to + segfault. Permission to commit to HEAD and stable branch granted + by Owen Taylor. + Sat Jun 15 23:26:41 2002 Owen Taylor <otaylor@redhat.com> * modules/arabic/arabic-ot.c: Support new Arabic diff --git a/pango/pango-markup.c b/pango/pango-markup.c index 6ca773d7..6698f872 100644 --- a/pango/pango-markup.c +++ b/pango/pango-markup.c @@ -1175,7 +1175,7 @@ span_parse_func (MarkupData *md, char *end = NULL; glong n; - n = strtol (weight, &end, 10); + n = strtol (rise, &end, 10); if (*end != '\0') { |