Fix memory leak in xkeyboard.cc.

chrome/browser/chromeos/input_method/xkeyboard.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 "chrome/browser/chromeos/input_method/xkeyboard.h"
 
 #include <queue>
 #include <set>
 #include <string>
 #include <utility>
@@ skipping 141 matching lines @@
   XkbDescPtr xkb_desc =
       XkbGetKeyboard(ui::GetXDisplay(), XkbAllComponentsMask, XkbUseCoreKbd);
   if (!xkb_desc) {
     return kBadMask;
   }
 
   if (xkb_desc->dpy && xkb_desc->names && xkb_desc->names->vmods) {
     const std::string string_to_find(kNumLockVirtualModifierString);
     for (size_t i = 0; i < XkbNumVirtualMods; ++i) {
       const unsigned int virtual_mod_mask = 1U << i;
-      const char* virtual_mod_str =
+      char* virtual_mod_str =
           XGetAtomName(xkb_desc->dpy, xkb_desc->names->vmods[i]);
       if (!virtual_mod_str) {
         continue;
       }
       if (string_to_find == virtual_mod_str) {

[Daniel Kurtz, 2011/11/14 08:44:50]

Do you want to compare strings, or addresses?
Perhaps this should be:
  string_to_find.compare(virtual_mod_str)?

[Yusuke Sato, 2011/11/14 08:56:45]

I believe std::string does not have the problem since it has an implicit
char*-to-std::string constructor.

For example,

  const char x[] = "abc\0abc";
  const char* y = &x[4];
  std::string y_str(&x[4]);
  if (y != x)
    std::printf("addresses don't match\n");
  if (y_str == x)
    std::printf("strings match\n");

prints

  addresses don't match
  strings match

         if (!XkbVirtualModsToReal(xkb_desc, virtual_mod_mask, &real_mask)) {
           LOG(ERROR) << "XkbVirtualModsToReal failed";
           real_mask = kBadMask;  // reset the return value, just in case.
         }
+        XFree(virtual_mod_str);
         break;
       }
+      XFree(virtual_mod_str);
     }
   }
   XkbFreeKeyboard(xkb_desc, 0, True /* free all components */);
   return real_mask;
 }
 
 bool XKeyboard::SetLayoutInternal(const std::string& layout_name,
                                   const ModifierMap& modifier_map,
                                   bool force) {
   if (!is_running_on_chrome_os_) {
@@ skipping 332 matching lines @@
     case kCapsLockKey:
       return "capslock";
     case kNumModifierKeys:
       break;
   }
   return "";
 }
 
 }  // namespace input_method
 }  // namespace chromeos