From 8eb4666ffe0caa44f85dbc3f71bb7c502116362f Mon Sep 17 00:00:00 2001 From: Kjartan Maraas Date: Mon, 27 Jun 2005 14:38:19 +0000 Subject: Fix leaks Same Closes bug #308953. 2005-06-27 Kjartan Maraas * gtk/gtkhruler.c: (gtk_hruler_draw_ticks): Fix leaks * gtk/gtkvruler.c: (gtk_vruler_draw_ticks): Same Closes bug #308953. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtkhruler.c | 4 +++- gtk/gtkvruler.c | 4 +++- 5 files changed, 24 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2349d6266..21b81224f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-06-27 Kjartan Maraas + + * gtk/gtkhruler.c: (gtk_hruler_draw_ticks): Fix leaks + * gtk/gtkvruler.c: (gtk_vruler_draw_ticks): Same + Closes bug #308953. + 2005-06-27 Matthias Clasen * gtk/gtkiconcache.c (_gtk_icon_cache_new_for_path): Use diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 2349d6266..21b81224f 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2005-06-27 Kjartan Maraas + + * gtk/gtkhruler.c: (gtk_hruler_draw_ticks): Fix leaks + * gtk/gtkvruler.c: (gtk_vruler_draw_ticks): Same + Closes bug #308953. + 2005-06-27 Matthias Clasen * gtk/gtkiconcache.c (_gtk_icon_cache_new_for_path): Use diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 2349d6266..21b81224f 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2005-06-27 Kjartan Maraas + + * gtk/gtkhruler.c: (gtk_hruler_draw_ticks): Fix leaks + * gtk/gtkvruler.c: (gtk_vruler_draw_ticks): Same + Closes bug #308953. + 2005-06-27 Matthias Clasen * gtk/gtkiconcache.c (_gtk_icon_cache_new_for_path): Use diff --git a/gtk/gtkhruler.c b/gtk/gtkhruler.c index acbceb6f7..489b85490 100644 --- a/gtk/gtkhruler.c +++ b/gtk/gtkhruler.c @@ -190,7 +190,8 @@ gtk_hruler_draw_ticks (GtkRuler *ruler) lower = ruler->lower / ruler->metric->pixels_per_unit; if ((upper - lower) == 0) - return; +goto out; + increment = (gdouble) width / (upper - lower); /* determine the scale @@ -267,6 +268,7 @@ gtk_hruler_draw_ticks (GtkRuler *ruler) } cairo_fill (cr); +out: cairo_destroy (cr); g_object_unref (layout); diff --git a/gtk/gtkvruler.c b/gtk/gtkvruler.c index c013aa557..8e76e20aa 100644 --- a/gtk/gtkvruler.c +++ b/gtk/gtkvruler.c @@ -191,7 +191,8 @@ gtk_vruler_draw_ticks (GtkRuler *ruler) lower = ruler->lower / ruler->metric->pixels_per_unit; if ((upper - lower) == 0) - return; +goto out; + increment = (gdouble) width / (upper - lower); /* determine the scale @@ -273,6 +274,7 @@ gtk_vruler_draw_ticks (GtkRuler *ruler) } cairo_fill (cr); +out: cairo_destroy (cr); g_object_unref (layout); -- cgit v1.2.1