From 325238c642d9f89a4e46df6cf1bd6c9942097c1b Mon Sep 17 00:00:00 2001 From: Matthias Warkus Date: Tue, 2 Jul 2002 17:15:24 +0000 Subject: Fixed segfault, see ChangeLog --- ChangeLog | 7 +++++++ ChangeLog.pre-1-10 | 7 +++++++ ChangeLog.pre-1-2 | 7 +++++++ ChangeLog.pre-1-4 | 7 +++++++ ChangeLog.pre-1-6 | 7 +++++++ ChangeLog.pre-1-8 | 7 +++++++ pango/pango-markup.c | 2 +- 7 files changed, 43 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3e764afc..257de9d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2002-07-02 Matthias Warkus + + * pango/pango-markup.c (span_parse_func): Fixed typo that was + causing markup with attributes to + segfault. Permission to commit to HEAD and stable branch granted + by Owen Taylor. + Sat Jun 15 23:26:41 2002 Owen Taylor * 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 + + * pango/pango-markup.c (span_parse_func): Fixed typo that was + causing markup with attributes to + segfault. Permission to commit to HEAD and stable branch granted + by Owen Taylor. + Sat Jun 15 23:26:41 2002 Owen Taylor * 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 + + * pango/pango-markup.c (span_parse_func): Fixed typo that was + causing markup with attributes to + segfault. Permission to commit to HEAD and stable branch granted + by Owen Taylor. + Sat Jun 15 23:26:41 2002 Owen Taylor * 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 + + * pango/pango-markup.c (span_parse_func): Fixed typo that was + causing markup with attributes to + segfault. Permission to commit to HEAD and stable branch granted + by Owen Taylor. + Sat Jun 15 23:26:41 2002 Owen Taylor * 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 + + * pango/pango-markup.c (span_parse_func): Fixed typo that was + causing markup with attributes to + segfault. Permission to commit to HEAD and stable branch granted + by Owen Taylor. + Sat Jun 15 23:26:41 2002 Owen Taylor * 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 + + * pango/pango-markup.c (span_parse_func): Fixed typo that was + causing markup with attributes to + segfault. Permission to commit to HEAD and stable branch granted + by Owen Taylor. + Sat Jun 15 23:26:41 2002 Owen Taylor * 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') { -- cgit v1.2.1