diff options
| author | Owen Taylor <otaylor@redhat.com> | 2003-02-12 21:55:12 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2003-02-12 21:55:12 +0000 |
| commit | 8dc3104e2770f07424a39a824a8960ad5d60dfb3 (patch) | |
| tree | 1e6154dbecd343d1e3a8c4f3c9375eb7738629d6 | |
| parent | afd21b4d8471684f3393c239a19978432e9d33a6 (diff) | |
| download | pango-8dc3104e2770f07424a39a824a8960ad5d60dfb3.tar.gz | |
Guard against pango_layout_set_text (pango_layout_get_text (layout));
Wed Feb 12 16:48:46 2003 Owen Taylor <otaylor@redhat.com>
* pango/pango-layout.c (pango_layout_set_text):
Guard against
pango_layout_set_text (pango_layout_get_text (layout));
(#105612, Morten Welinder)
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 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-layout.c | 11 |
6 files changed, 42 insertions, 4 deletions
@@ -1,3 +1,10 @@ +Wed Feb 12 16:48:46 2003 Owen Taylor <otaylor@redhat.com> + + * pango/pango-layout.c (pango_layout_set_text): + Guard against + pango_layout_set_text (pango_layout_get_text (layout)); + (#105612, Morten Welinder) + Wed Feb 12 16:44:05 2003 Owen Taylor <otaylor@redhat.com> * examples/viewer-qt.cc: Remove call to diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 09562660..5a02d897 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,10 @@ +Wed Feb 12 16:48:46 2003 Owen Taylor <otaylor@redhat.com> + + * pango/pango-layout.c (pango_layout_set_text): + Guard against + pango_layout_set_text (pango_layout_get_text (layout)); + (#105612, Morten Welinder) + Wed Feb 12 16:44:05 2003 Owen Taylor <otaylor@redhat.com> * examples/viewer-qt.cc: Remove call to diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 09562660..5a02d897 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,10 @@ +Wed Feb 12 16:48:46 2003 Owen Taylor <otaylor@redhat.com> + + * pango/pango-layout.c (pango_layout_set_text): + Guard against + pango_layout_set_text (pango_layout_get_text (layout)); + (#105612, Morten Welinder) + Wed Feb 12 16:44:05 2003 Owen Taylor <otaylor@redhat.com> * examples/viewer-qt.cc: Remove call to diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 09562660..5a02d897 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,10 @@ +Wed Feb 12 16:48:46 2003 Owen Taylor <otaylor@redhat.com> + + * pango/pango-layout.c (pango_layout_set_text): + Guard against + pango_layout_set_text (pango_layout_get_text (layout)); + (#105612, Morten Welinder) + Wed Feb 12 16:44:05 2003 Owen Taylor <otaylor@redhat.com> * examples/viewer-qt.cc: Remove call to diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 09562660..5a02d897 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,10 @@ +Wed Feb 12 16:48:46 2003 Owen Taylor <otaylor@redhat.com> + + * pango/pango-layout.c (pango_layout_set_text): + Guard against + pango_layout_set_text (pango_layout_get_text (layout)); + (#105612, Morten Welinder) + Wed Feb 12 16:44:05 2003 Owen Taylor <otaylor@redhat.com> * examples/viewer-qt.cc: Remove call to diff --git a/pango/pango-layout.c b/pango/pango-layout.c index 6cef2677..4e030ff8 100644 --- a/pango/pango-layout.c +++ b/pango/pango-layout.c @@ -722,11 +722,14 @@ pango_layout_set_text (PangoLayout *layout, const char *text, int length) { - const gchar *end; + const char *end; + char *old_text; g_return_if_fail (layout != NULL); g_return_if_fail (length == 0 || text != NULL); + old_text = layout->text; + if (length != 0) { if (!g_utf8_validate (text, length, &end)) @@ -735,9 +738,6 @@ pango_layout_set_text (PangoLayout *layout, length = end - text; } - if (layout->text) - g_free (layout->text); - /* NULL-terminate the text for convenience. */ layout->text = g_malloc (length + 1); @@ -748,6 +748,9 @@ pango_layout_set_text (PangoLayout *layout, layout->length = length; pango_layout_clear_lines (layout); + + if (old_text) + g_free (old_text); } /** |