Fix several memory leaks in gtk_clipboard_dump utility.

tools/gtk_clipboard_dump/gtk_clipboard_dump.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <gtk/gtk.h>
 #include <stdio.h>
 #include <string.h>
 
 namespace {
 
@@ skipping 10 matching lines @@
                                       gdk_atom_intern("TARGETS", false));
   if (!target_data) {
     printf("failed to get the contents!\n");
     return;
   }
 
   gtk_selection_data_get_targets(target_data, &targets, &num_targets);
 
   printf("%d available targets:\n---------------\n", num_targets);
 
+  gboolean target_omitted;
+  gchar* target_name;

[Evan Stade, 2013/05/09 04:46:06]

no reason for these to be declared outside the for loop

   for (int i = 0; i < num_targets; i++) {
-    printf("  [format: %s", gdk_atom_name(targets[i]));
+    target_name = gdk_atom_name(targets[i]);
+    printf("  [format: %s", target_name);
     GtkSelectionData* data = gtk_clipboard_wait_for_contents(clip, targets[i]);
     if (!data) {
       printf("]: NULL\n\n");
+      g_free(target_name);

[Evan Stade, 2013/05/09 04:46:06]

just copy it into a std::string and free right away

       continue;
     }
 
     printf(" / length: %d / bits %d]: ", data->length, data->format);
 
-    if (strstr(gdk_atom_name(targets[i]), "image")) {
+    if (strstr(target_name, "image")) {
       printf("(image omitted)\n\n");
-      continue;
-    } else if (strstr(gdk_atom_name(targets[i]), "TIMESTAMP")) {
+      target_omitted = true;
+    } else if (strstr(target_name, "TIMESTAMP")) {
       // TODO(estade): Print the time stamp in human readable format.
       printf("(time omitted)\n\n");
+      target_omitted = true;
+    } else

[Evan Stade, 2013/05/09 04:46:06]

curlies

+      target_omitted = false;
+
+    g_free(target_name);
+    if (target_omitted) {
+      gtk_selection_data_free(data);
       continue;
     }
 
     for (int j = 0; j < data->length; j++) {

[Evan Stade, 2013/05/09 04:46:06]

just put all of this inside the else case

       // Output data one byte at a time. Currently wide strings look
       // pretty weird.
       printf("%c", (data->data[j] == 0 ? '_' : data->data[j]));
     }
     printf("\n\n");
+    gtk_selection_data_free(data);
   }
 
   if (num_targets <= 0) {
     printf("No targets advertised. Text is: ");
     gchar* text = gtk_clipboard_wait_for_text(clip);
     printf("%s\n", text ? text : "NULL");
     g_free(text);
   }
 
   g_free(targets);
+  gtk_selection_data_free(target_data);
 }
 
 }
 
 /* Small program to dump the contents of GTK's clipboards to the terminal.
  * Feel free to add to it or improve formatting or whatnot.
  */
 int main(int argc, char* argv[]) {
   gtk_init(&argc, &argv);
 
   printf("Desktop clipboard\n");
   PrintClipboardContents(gtk_clipboard_get(GDK_SELECTION_CLIPBOARD));
 
   printf("X clipboard\n");
   PrintClipboardContents(gtk_clipboard_get(GDK_SELECTION_PRIMARY));
 }