summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-09 06:59:51 +0000
committerhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-09 06:59:51 +0000
commit91c521b79fcd8a696f5a08013269cb1fd2b7c394 (patch)
tree379b19464f595946218d603b87466654a2899469
parente91f979dc34c472c24592d2090672122fd4445dc (diff)
downloadchromium_src-91c521b79fcd8a696f5a08013269cb1fd2b7c394.zip
chromium_src-91c521b79fcd8a696f5a08013269cb1fd2b7c394.tar.gz
chromium_src-91c521b79fcd8a696f5a08013269cb1fd2b7c394.tar.bz2
Fix memory leak in chromoting code
Fixing leak in DecompressorZlib and removed suppression. BUG=57910, 57799 TEST=valgrind bot is green Review URL: http://codereview.chromium.org/6458009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74256 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--remoting/base/decompressor_zlib.cc2
-rw-r--r--tools/valgrind/memcheck/suppressions.txt10
2 files changed, 1 insertions, 11 deletions
diff --git a/remoting/base/decompressor_zlib.cc b/remoting/base/decompressor_zlib.cc
index bb4a83d..4eb5168 100644
--- a/remoting/base/decompressor_zlib.cc
+++ b/remoting/base/decompressor_zlib.cc
@@ -25,7 +25,7 @@ DecompressorZlib::DecompressorZlib() {
}
DecompressorZlib::~DecompressorZlib() {
- Reset();
+ inflateEnd(stream_.get());
}
void DecompressorZlib::Reset() {
diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt
index 4459b61..3c510e9 100644
--- a/tools/valgrind/memcheck/suppressions.txt
+++ b/tools/valgrind/memcheck/suppressions.txt
@@ -2902,16 +2902,6 @@
fun:_ZN14RunnableMethodIN3IPC12ChannelProxy7ContextEMS2_FvRKNS0_7MessageEE6Tuple1IS3_EE3RunEv
}
{
- bug_57910
- Memcheck:Leak
- fun:malloc
- ...
- fun:*inflateInit2_
- ...
- fun:_ZN8remoting16DecompressorZlib10InitStreamEv
- fun:_ZN8remoting16DecompressorZlib5ResetEv
-}
-{
bug_57949
Memcheck:Addr4
fun:_ZNK22OpaqueBrowserFrameView24NonClientTopBorderHeightEbb