summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/base/ssl_test_util.cc4
-rw-r--r--tools/valgrind/suppressions.txt7
2 files changed, 10 insertions, 1 deletions
diff --git a/net/base/ssl_test_util.cc b/net/base/ssl_test_util.cc
index 2cb309e..04731b5e7 100644
--- a/net/base/ssl_test_util.cc
+++ b/net/base/ssl_test_util.cc
@@ -312,6 +312,10 @@ bool TestServerLauncher::LoadTestRootCert() {
return true;
// TODO(dkegel): figure out how to get this to only happen once?
+
+ // This currently leaks a little memory.
+ // TODO(dkegel): fix the leak and remove the entry in
+ // tools/valgrind/suppressions.txt
cert_ = reinterpret_cast<PrivateCERTCertificate*>(
LoadTemporaryCert(GetRootCertPath()));
DCHECK(cert_);
diff --git a/tools/valgrind/suppressions.txt b/tools/valgrind/suppressions.txt
index a9328fc..1897aa0 100644
--- a/tools/valgrind/suppressions.txt
+++ b/tools/valgrind/suppressions.txt
@@ -118,4 +118,9 @@
...
fun:_ZN7logging11InitLoggingEPKcNS_18LoggingDestinationENS_15LogLockingStateENS_20OldFileDeletionStateE
}
-
+{
+ Linux tests don't bother to undo net::TestServerLauncher::LoadTestRootCert().
+ Memcheck:Leak
+ ...
+ fun:_ZN3net18TestServerLauncher16LoadTestRootCertEv
+}