Fix some memory leaks.

ui/base/touch/touch_factory.cc

 // Copyright (c) 2011 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 "ui/base/touch/touch_factory.h"
 
 #include <X11/cursorfont.h>
 #include <X11/extensions/XInput.h>
 #include <X11/extensions/XInput2.h>
 #include <X11/extensions/XIproto.h>
@@ skipping 46 matching lines @@
   if (!atom_tp)
     return NULL;
 
   for (int i = 0; i < info->num_classes; i++) {
     if (info->classes[i]->type != XIValuatorClass)
       continue;
     XIValuatorClassInfo* v =
         reinterpret_cast<XIValuatorClassInfo*>(info->classes[i]);
 
     if (v->label) {
-      const char* atom = XGetAtomName(display, v->label);
-      if (atom && strcmp(atom, atom_tp) == 0)
+      char* atom = XGetAtomName(display, v->label);

[sky, 2012/02/06 17:55:47]

How about a scoping object?

[sadrul, 2012/02/06 19:48:30]

Sounds good. Done.

+      if (atom && strcmp(atom, atom_tp) == 0) {
+        XFree(atom);
         return v;
+      }
+      XFree(atom);
     }
   }
 
   return NULL;
 }
 
 }  // namespace
 
 namespace ui {
 
@@ skipping 64 matching lines @@
   // If XInput2 is not supported, this will return null (with count of -1) so
   // we assume there cannot be any touch devices.
   int count = 0;
   touch_device_available_ = false;
   touch_device_lookup_.reset();
   touch_device_list_.clear();
 #if !defined(USE_XI2_MT)
   XDeviceInfo* devlist = XListInputDevices(display, &count);
   for (int i = 0; i < count; i++) {
     if (devlist[i].type) {
-      const char* devtype = XGetAtomName(display, devlist[i].type);
+      char* devtype = XGetAtomName(display, devlist[i].type);
       if (devtype && !strcmp(devtype, XI_TOUCHSCREEN)) {
         touch_device_lookup_[devlist[i].id] = true;
         touch_device_list_[devlist[i].id] = true;
         touch_device_available_ = true;
       }
+      XFree(devtype);
     }
   }
   if (devlist)
     XFreeDeviceList(devlist);
 #endif
 
   // Instead of asking X for the list of devices all the time, let's maintain a
   // list of pointer devices we care about.
   // It should not be necessary to select for slave devices. XInput2 provides
   // enough information to the event callback to decide which slave device
@@ skipping 323 matching lines @@
                                       float* max) {
   if (valuator_lookup_[deviceid][tp] >= 0) {
     *min = touch_param_min_[deviceid][tp];
     *max = touch_param_max_[deviceid][tp];
     return true;
   }
   return false;
 }
 
 }  // namespace ui