summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2003-05-02 18:22:52 +0000
committerOwen Taylor <otaylor@src.gnome.org>2003-05-02 18:22:52 +0000
commit10b3e270ec190a0c67595d6dd43fada191a9c25e (patch)
tree2e4bf620740ae739a8eb360010689dc600ade597
parentd2e07e467de34df79645adb08c33aefa5eaf3364 (diff)
downloadpango-10b3e270ec190a0c67595d6dd43fada191a9c25e.tar.gz
Fix a harmless uninitialized memory read. (#109625, Rich Burridge)
Fri May 2 14:21:20 2003 Owen Taylor <otaylor@redhat.com> * pango/pango-layout.c (update_run): Fix a harmless uninitialized memory read. (#109625, Rich Burridge)
-rw-r--r--pango/pango-layout.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/pango/pango-layout.c b/pango/pango-layout.c
index a2234189..ce484f90 100644
--- a/pango/pango-layout.c
+++ b/pango/pango-layout.c
@@ -3982,16 +3982,14 @@ update_run (PangoLayoutIter *iter,
line_ext = (Extents*)iter->line_extents_link->data;
- /* Note that in iter_new() the old_run_width is garbage,
- * but we don't use it since we're on the first run of
+ /* Note that in iter_new() the iter->run_logical_rect.width
+ * is garbage but we don't use it since we're on the first run of
* a line.
*/
- old_run_width = iter->run_logical_rect.width;
-
if (iter->run_list_link == iter->line->runs)
iter->run_x = line_ext->logical_rect.x;
else
- iter->run_x += old_run_width;
+ iter->run_x += iter->run_logical_rect.width;
if (iter->run)
{