summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Warkus <mawarkus@src.gnome.org>2002-07-02 17:18:57 +0000
committerMatthias Warkus <mawarkus@src.gnome.org>2002-07-02 17:18:57 +0000
commit7a82e6497b415a19c875c02331badce3e4efb124 (patch)
treeffd7ac06a58ef9a852a2b8544211beebe5fd1272
parente727aaa0eef442623a45da52fc2e4f5392b871ba (diff)
downloadpango-7a82e6497b415a19c875c02331badce3e4efb124.tar.gz
Fixed segfault, see ChangeLog
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLog.pre-1-106
-rw-r--r--ChangeLog.pre-1-26
-rw-r--r--ChangeLog.pre-1-46
-rw-r--r--ChangeLog.pre-1-66
-rw-r--r--ChangeLog.pre-1-86
-rw-r--r--pango/pango-markup.c2
7 files changed, 37 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 32897c06..260e5c14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-07-02 Matthias Warkus <mawarkus@gnome.org>
+
+ * pango/pango-markup.c: 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 32897c06..260e5c14 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,9 @@
+2002-07-02 Matthias Warkus <mawarkus@gnome.org>
+
+ * pango/pango-markup.c: 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 32897c06..260e5c14 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,9 @@
+2002-07-02 Matthias Warkus <mawarkus@gnome.org>
+
+ * pango/pango-markup.c: 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 32897c06..260e5c14 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,9 @@
+2002-07-02 Matthias Warkus <mawarkus@gnome.org>
+
+ * pango/pango-markup.c: 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 32897c06..260e5c14 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,9 @@
+2002-07-02 Matthias Warkus <mawarkus@gnome.org>
+
+ * pango/pango-markup.c: 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 32897c06..260e5c14 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,9 @@
+2002-07-02 Matthias Warkus <mawarkus@gnome.org>
+
+ * pango/pango-markup.c: 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')
{