From 4744c7f8a4963d2538eeb674e7310de4fc6a10bb Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 19 Dec 2007 12:38:36 +0000 Subject: [PATCH] (gtk) quick fix for the memory corruption bug reported by werehamster --- gtk/stats.c | 15 ++++++++------- gtk/tr_window.c | 1 - 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gtk/stats.c b/gtk/stats.c index da18a1024..e15fd6fa0 100644 --- a/gtk/stats.c +++ b/gtk/stats.c @@ -31,19 +31,20 @@ struct stat_ui }; static void -setLabel( GtkWidget * w, char * ownme ) +setLabel( GtkWidget * w, const char * str ) { - gtk_label_set_text( GTK_LABEL(w), ownme ); - g_free( ownme ); + gtk_label_set_text( GTK_LABEL(w), str ); } static void setLabelFromRatio( GtkWidget * w, double d ) { - char * str = ( (int)d == TR_RATIO_NA ) - ? g_strdup_printf( _("None" ) ) - : g_strdup_printf( "%.1f%%", d ); - setLabel( w, str ); + char buf[128]; + if( ( (int)d == TR_RATIO_NA ) ) + g_strlcpy( buf, _("None"), sizeof(buf) ); + else + g_snprintf( buf, sizeof(buf), "%.1f", d ); + setLabel( w, buf ); } static gboolean diff --git a/gtk/tr_window.c b/gtk/tr_window.c index 5f1ff8de7..f2ffbccc8 100644 --- a/gtk/tr_window.c +++ b/gtk/tr_window.c @@ -163,7 +163,6 @@ tr_window_new( GtkUIManager * ui_manager ) gtk_widget_set_usize (w, 0u, 6u); gtk_box_pack_start( GTK_BOX(vbox), w, FALSE, FALSE, 0 ); - /* statusbar */ h = gtk_hbox_new( FALSE, 0 ); w = p->ul_lb = gtk_label_new( NULL );