diff options
author | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-24 13:03:04 +0000 |
---|---|---|
committer | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-24 13:03:04 +0000 |
commit | 0145c2b269a6b0cb1f46698b1d84ccf9412fb50c (patch) | |
tree | b08573e4640b675a5e3d7a9e999cbc8143b05edf /base/crypto/rsa_private_key_nss.cc | |
parent | 65dff99d25854d069e2e7926ee9e8ede11787410 (diff) | |
download | chromium_src-0145c2b269a6b0cb1f46698b1d84ccf9412fb50c.zip chromium_src-0145c2b269a6b0cb1f46698b1d84ccf9412fb50c.tar.gz chromium_src-0145c2b269a6b0cb1f46698b1d84ccf9412fb50c.tar.bz2 |
Annotated the scoped leak inside base::RSAPrivateKey::CreateFromPrivateKeyInfo,
removed the annotations from the tests calling it (RSAPrivateKeyUnitTest.* and
SignatureCreatorTest.BasicTest)
BUG=34742
TBR=wtc
Review URL: http://codereview.chromium.org/1271002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42459 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/crypto/rsa_private_key_nss.cc')
-rw-r--r-- | base/crypto/rsa_private_key_nss.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/base/crypto/rsa_private_key_nss.cc b/base/crypto/rsa_private_key_nss.cc index 26bb10cc..a6b8ffa 100644 --- a/base/crypto/rsa_private_key_nss.cc +++ b/base/crypto/rsa_private_key_nss.cc @@ -11,6 +11,7 @@ #include <iostream> #include <list> +#include "base/leak_annotations.h" #include "base/logging.h" #include "base/nss_util.h" #include "base/scoped_ptr.h" @@ -63,6 +64,9 @@ RSAPrivateKey* RSAPrivateKey::Create(uint16 num_bits) { // static RSAPrivateKey* RSAPrivateKey::CreateFromPrivateKeyInfo( const std::vector<uint8>& input) { + // This method currently leaks some memory. + // See http://crbug.com/34742. + ANNOTATE_SCOPED_MEMORY_LEAK; scoped_ptr<RSAPrivateKey> result(new RSAPrivateKey); PK11SlotInfo *slot = PK11_GetInternalSlot(); |