summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvsevik@chromium.org <vsevik@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-27 20:06:53 +0000
committervsevik@chromium.org <vsevik@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-27 20:06:53 +0000
commit8396196fbdf85a05ff666f7d6b1ee3fb94458deb (patch)
tree36f6427544c30bcfdc263262c67f1d601eb3a390
parentb6216632aac80088609da7ceb617f4a81c592730 (diff)
downloadchromium_src-8396196fbdf85a05ff666f7d6b1ee3fb94458deb.zip
chromium_src-8396196fbdf85a05ff666f7d6b1ee3fb94458deb.tar.gz
chromium_src-8396196fbdf85a05ff666f7d6b1ee3fb94458deb.tar.bz2
Fixed memory leak in DevToolsNetLogObserver
Review URL: http://codereview.chromium.org/6903064 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83197 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/debugger/devtools_netlog_observer.cc4
-rw-r--r--tools/valgrind/memcheck/suppressions.txt19
2 files changed, 2 insertions, 21 deletions
diff --git a/chrome/browser/debugger/devtools_netlog_observer.cc b/chrome/browser/debugger/devtools_netlog_observer.cc
index f5d370b..5989c1d 100644
--- a/chrome/browser/debugger/devtools_netlog_observer.cc
+++ b/chrome/browser/debugger/devtools_netlog_observer.cc
@@ -213,11 +213,11 @@ void DevToolsNetLogObserver::OnAddSocketEntry(
if (net::NetLog::TYPE_SOCKET_BYTES_RECEIVED == type) {
int byte_count = 0;
- Value* value = params->ToValue();
+ scoped_ptr<Value> value(params->ToValue());
if (!value->IsType(Value::TYPE_DICTIONARY))
return;
- DictionaryValue* dValue = static_cast<DictionaryValue*>(value);
+ DictionaryValue* dValue = static_cast<DictionaryValue*>(value.get());
if (!dValue->GetInteger("byte_count", &byte_count))
return;
diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt
index 83414d4..b0959fa 100644
--- a/tools/valgrind/memcheck/suppressions.txt
+++ b/tools/valgrind/memcheck/suppressions.txt
@@ -4493,25 +4493,6 @@
fun:_Znw*
fun:_ZN16RenderWidgetHost9WasHiddenEv
}
-{
- bug_80658
- Memcheck:Leak
- fun:_Znw*
- ...
- fun:_ZNSt3mapISsP5ValueSt4lessISsESaISt4pairIKSsS1_EEEixERS5_
- fun:_ZN15DictionaryValue23SetWithoutPathExpansionERKSsP5Value
- fun:_ZN15DictionaryValue3SetERKSsP5Value
- fun:_ZN15DictionaryValue10SetIntegerERKSsi
- fun:*31NetLogBytesTransferredParameter7ToValueEv
- fun:_ZN22DevToolsNetLogObserver16OnAddSocketEntryEN3net6NetLog9EventTypeERKN4base9TimeTicksERKNS1_6SourceENS1_10EventPhaseEPNS1_15EventParametersE
- fun:_ZN22DevToolsNetLogObserver10OnAddEntryEN3net6NetLog9EventTypeERKN4base9TimeTicksERKNS1_6SourceENS1_10EventPhaseEPNS1_15EventParametersE
- fun:_ZN12ChromeNetLog8AddEntryEN3net6NetLog9EventTypeERKN4base9TimeTicksERKNS1_6SourceENS1_10EventPhaseEPNS1_15EventParametersE
- fun:_ZNK3net11BoundNetLog8AddEntryENS_6NetLog9EventTypeENS1_10EventPhaseERK13scoped_refptrINS1_15EventParametersEE
- fun:_ZNK3net11BoundNetLog8AddEventENS_6NetLog9EventTypeERK13scoped_refptrINS1_15EventParametersEE
- fun:_ZNK3net12ClientSocket15LogByteTransferERKNS_11BoundNetLogENS_6NetLog9EventTypeEiPc
- fun:_ZN3net23TCPClientSocketLibevent15DidCompleteReadEv
- fun:_ZN3net23TCPClientSocketLibevent11ReadWatcher28OnFileCanReadWithoutBlockingEi
-}
#-----------------------------------------------------------------------
# These only occur on our Google workstations
{