diff options
author | Kristian Monsen <kristianm@google.com> | 2011-05-11 20:53:37 +0100 |
---|---|---|
committer | Kristian Monsen <kristianm@google.com> | 2011-05-16 13:54:48 +0100 |
commit | 21d179b334e59e9a3bfcaed4c4430bef1bc5759d (patch) | |
tree | 64e2bb6da27af6a5c93ca34f6051584aafbfcb9e /base/openssl_util.h | |
parent | 0c63f00edd6ed0482fd5cbcea937ca088baf7858 (diff) | |
download | external_chromium-21d179b334e59e9a3bfcaed4c4430bef1bc5759d.zip external_chromium-21d179b334e59e9a3bfcaed4c4430bef1bc5759d.tar.gz external_chromium-21d179b334e59e9a3bfcaed4c4430bef1bc5759d.tar.bz2 |
Merge Chromium at 10.0.621.0: Initial merge by git.
Change-Id: I070cc91c608dfa4a968a5a54c173260765ac8097
Diffstat (limited to 'base/openssl_util.h')
-rw-r--r-- | base/openssl_util.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/base/openssl_util.h b/base/openssl_util.h index 60cb0b7..9ce7f81 100644 --- a/base/openssl_util.h +++ b/base/openssl_util.h @@ -18,7 +18,9 @@ class ScopedOpenSSL { public: ScopedOpenSSL() : ptr_(NULL) { } explicit ScopedOpenSSL(T* ptr) : ptr_(ptr) { } - ~ScopedOpenSSL() { if (ptr_) (*destructor)(ptr_); } + ~ScopedOpenSSL() { + reset(NULL); + } T* get() const { return ptr_; } void reset(T* ptr) { |