Merge lp:~mitya57/gnome-system-monitor/lp1110498 into lp:~ubuntu-desktop/gnome-system-monitor/ubuntu

[Dmitry Shachnev]

This is a backport of upstream commit http://git.gnome.org/browse/gnome-system-monitor/commit/?id=c2c23596a3 that fixes some memory leaks.

[Martin Pitt (pitti)]

We just got 3.7.90 into raring, which already has this applied. Thanks!

review: Disapprove

Unmerged revisions

53. By Dmitry Shachnev on 2013-02-19

debian/patches/00git_leaks_fixes.patch: Fixed various memory leaks in
prettytable, procman-app, sysinfo and util (LP: #1110498).

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-12 21:26:05 +0000
+++ debian/changelog	2013-02-19 15:52:35 +0000
@@ -1,3 +1,10 @@
+gnome-system-monitor (3.6.1-0ubuntu2) UNRELEASED; urgency=low
+
+  * debian/patches/00git_leaks_fixes.patch: Fixed various memory leaks in
+    prettytable, procman-app, sysinfo and util (LP: #1110498).
+
+ -- Dmitry Shachnev <[e-mail]>  Tue, 19 Feb 2013 19:00:23 +0400
+
 gnome-system-monitor (3.6.1-0ubuntu1) raring; urgency=low
 
   * New upstream release

=== added file 'debian/patches/00git_leaks_fixes.patch'
--- debian/patches/00git_leaks_fixes.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/00git_leaks_fixes.patch	2013-02-19 15:52:35 +0000
@@ -0,0 +1,98 @@
+Description: Fixed various memory leaks in prettytable, procman-app, sysinfo and util.
+Origin: upstream, http://git.gnome.org/browse/gnome-system-monitor/commit/?id=c2c23596a3
+Bug: https://bugzilla.gnome.org/686812
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1110498
+
+Index: gnome-system-monitor-3.6.1/src/prettytable.cpp
+===================================================================
+--- gnome-system-monitor-3.6.1.orig/src/prettytable.cpp	2012-10-15 19:52:10.000000000 +0400
++++ gnome-system-monitor-3.6.1/src/prettytable.cpp	2013-02-19 19:03:34.854667207 +0400
+@@ -206,6 +206,7 @@
+       icon = this->theme->load_gicon(gicon, APP_ICON_SIZE, Gtk::ICON_LOOKUP_USE_BUILTIN);
+   }
+ 
++  g_strfreev(cmdline);
+   return icon;
+ }
+ 
+Index: gnome-system-monitor-3.6.1/src/sysinfo.cpp
+===================================================================
+--- gnome-system-monitor-3.6.1.orig/src/sysinfo.cpp	2012-10-15 19:44:36.000000000 +0400
++++ gnome-system-monitor-3.6.1/src/sysinfo.cpp	2013-02-19 19:03:34.854667207 +0400
+@@ -112,7 +112,10 @@
+ 
+             /* translators: This is the type of architecture, for example:
+              * "64-bit" or "32-bit" */
+-            return string(g_strdup_printf (_("%d-bit"), bits));
++            char* bytes = g_strdup_printf (_("%d-bit"), bits);
++            string retval(bytes);
++            g_free(bytes);
++            return retval;
+         }
+ 
+         typedef struct
+Index: gnome-system-monitor-3.6.1/src/util.cpp
+===================================================================
+--- gnome-system-monitor-3.6.1.orig/src/util.cpp	2012-10-15 19:44:36.000000000 +0400
++++ gnome-system-monitor-3.6.1/src/util.cpp	2013-02-19 19:24:38.615519347 +0400
+@@ -590,7 +590,10 @@
+ 
+     std::string format_network(guint64 rate, guint64 max_rate)
+     {
+-        return procman::format_size(rate, max_rate, ProcData::get_instance()->config.network_in_bits);
++        char* bytes = procman::format_size(rate, max_rate, ProcData::get_instance()->config.network_in_bits);
++        std::string formatted(bytes);
++        g_free(bytes);
++        return formatted;
+     }
+ 
+ 
+Index: gnome-system-monitor-3.6.1/src/procman.cpp
+===================================================================
+--- gnome-system-monitor-3.6.1.orig/src/procman.cpp	2012-10-15 19:44:36.000000000 +0400
++++ gnome-system-monitor-3.6.1/src/procman.cpp	2013-02-19 19:23:03.381350019 +0400
+@@ -193,6 +193,7 @@
+             child = g_variant_get_child_value ( cpu_colors_var, i );
+             g_variant_get_child( child, 1, "s", &color);
+             g_variant_builder_add_value ( &builder, child);
++            g_variant_unref (child);
+         } else {
+             color = g_strdup ("#f25915e815e8");
+             g_variant_builder_add(&builder, "(us)", i, color);
+@@ -204,7 +205,11 @@
+     // if the user has more cores than colors stored in the gsettings, store the newly built gvariant in gsettings
+     if (n < static_cast<guint>(procdata->config.num_cpus)) {
+         g_settings_set_value(settings, "cpu-colors", full);
++    } else {
++        g_variant_unref(full);
+     }
++
++    g_variant_unref(cpu_colors_var);
+ }
+ 
+ static void
+@@ -223,7 +228,7 @@
+         return;
+     }
+ 
+-    const gchar *color = g_settings_get_string (settings, key);
++    gchar *color = g_settings_get_string (settings, key);
+     if (g_str_equal (key, "mem-color")) {
+         gdk_color_parse (color, &procdata->config.mem_color);
+         procdata->mem_graph->colors.at(0) = procdata->config.mem_color;
+@@ -243,6 +248,7 @@
+     else {
+         g_assert_not_reached();
+     }
++    g_free (color);
+ }
+ 
+ static void
+@@ -457,6 +463,7 @@
+ 
+         proctable_set_columns_order(GTK_TREE_VIEW(tree), order);
+ 
++        g_variant_unref(value);
+         g_slist_free(order);
+     }
+ 

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-08-24 13:36:34 +0000
+++ debian/patches/series	2013-02-19 15:52:35 +0000
@@ -1,1 +1,2 @@
 # Debian patches for gnome-system-monitor
+00git_leaks_fixes.patch