Annotated the scoped leak inside base::RSAPrivateKey::CreateFromPrivateKeyInf...

base/crypto/rsa_private_key_nss.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/crypto/rsa_private_key.h"
 
 #include <cryptohi.h>
 #include <keyhi.h>
 #include <pk11pub.h>
 
 #include <iostream>
 #include <list>
 
+#include "base/leak_annotations.h"
 #include "base/logging.h"
 #include "base/nss_util.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 
 // TODO(rafaelw): Consider refactoring common functions and definitions from
 // rsa_private_key_win.cc or using NSS's ASN.1 encoder.
 namespace {
 
 static bool ReadAttribute(SECKEYPrivateKey* key,
@@ skipping 32 matching lines @@
   PK11_FreeSlot(slot);
   if (!result->key_)
     return NULL;
 
   return result.release();
 }
 
 // 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();
   if (!slot)
     return NULL;
 
   SECItem der_private_key_info;
   der_private_key_info.data = const_cast<unsigned char*>(&input.front());
   der_private_key_info.len = input.size();
   SECStatus rv =  PK11_ImportDERPrivateKeyInfoAndReturnKey(slot,

[wtc, 2010/03/24 19:17:06]

If the annotation doesn't need to be at the beginning of a
function, it would be nice to put the annotation here because
the leak occurs in the PK11_ImportDERPrivateKeyInfoAndReturnKey
call.

It would be nice to reference NSS bug 518443 and note that
it's fixed in NSS 3.12.5, so that we know when we can remove
this annotation in the future.

       &der_private_key_info, NULL, NULL, PR_FALSE, PR_FALSE,
       KU_DIGITAL_SIGNATURE, &result->key_, NULL);
   PK11_FreeSlot(slot);
   if (rv != SECSuccess) {
     NOTREACHED();
     return NULL;
   }
 
   result->public_key_ = SECKEY_ConvertToPublicKey(result->key_);
   if (!result->public_key_) {
@@ skipping 45 matching lines @@
   }
 
   for (size_t i = 0; i < der_pubkey->len; ++i)
     output->push_back(der_pubkey->data[i]);
 
   SECITEM_FreeItem(der_pubkey, PR_TRUE);
   return true;
 }
 
 }  // namespace base