diff options
| author | yusukes@chromium.org <yusukes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-14 10:28:59 +0000 |
|---|---|---|
| committer | yusukes@chromium.org <yusukes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-14 10:28:59 +0000 |
| commit | b2245b371387c5bd548ea7426157c2b92d73cdee (patch) | |
| tree | 909daf90af4012abcd9db442d98ebfe75c18411e | |
| parent | 24e50130ab68cd1cfe577da040a07794c79a88b1 (diff) | |
| download | chromium_src-b2245b371387c5bd548ea7426157c2b92d73cdee.zip chromium_src-b2245b371387c5bd548ea7426157c2b92d73cdee.tar.gz chromium_src-b2245b371387c5bd548ea7426157c2b92d73cdee.tar.bz2 | |
Fix memory leak in xkeyboard.cc.
BUG=chromium:103433
TEST=ran linux_memory trybot
Review URL: http://codereview.chromium.org/8552001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109858 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/input_method/xkeyboard.cc | 4 | ||||
| -rw-r--r-- | tools/valgrind/memcheck/suppressions.txt | 8 |
2 files changed, 3 insertions, 9 deletions
diff --git a/chrome/browser/chromeos/input_method/xkeyboard.cc b/chrome/browser/chromeos/input_method/xkeyboard.cc index 0050a51..e3379b2 100644 --- a/chrome/browser/chromeos/input_method/xkeyboard.cc +++ b/chrome/browser/chromeos/input_method/xkeyboard.cc @@ -159,7 +159,7 @@ unsigned int XKeyboard::GetNumLockMask() { 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; @@ -169,8 +169,10 @@ unsigned int XKeyboard::GetNumLockMask() { 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 */); diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt index e285f4b..6a6698d 100644 --- a/tools/valgrind/memcheck/suppressions.txt +++ b/tools/valgrind/memcheck/suppressions.txt @@ -5211,14 +5211,6 @@ fun:_ZN8chromeos12_GLOBAL__N_127GViewRequestInterceptorTest5SetUpEv } { - bug_103433 - Memcheck:Leak - fun:malloc - ... - fun:XGetAtomName - fun:_ZN8chromeos12input_method9XKeyboard14GetNumLockMaskEv -} -{ bug_103467 Memcheck:Cond fun:_ZNK7WebCore12NamedNodeMap20mappedMapsEquivalentEPKS0_ |