diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-05-10 20:41:38 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-05-10 21:13:02 +0100 |
| commit | 92da838efc86c40c78fb6e993b937117b6393af7 (patch) | |
| tree | a04bdf9521ae6d9d575906181138d46eb2fec575 | |
| parent | 106d1621119b919b7f88d1ca34223ac3ba7d7909 (diff) | |
coverity#1079343 Uninitialized pointer field
Change-Id: I05ec88144273c15181e9afa8f616b0ab11695f04
| -rw-r--r-- | include/oox/crypto/CryptTools.hxx | 2 | ||||
| -rw-r--r-- | oox/source/crypto/CryptTools.cxx | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/include/oox/crypto/CryptTools.hxx b/include/oox/crypto/CryptTools.hxx index a724f64ff218..86bfb79fa2d3 100644 --- a/include/oox/crypto/CryptTools.hxx +++ b/include/oox/crypto/CryptTools.hxx @@ -53,6 +53,7 @@ public: }; protected: + CryptoType mType; #if USE_TLS_OPENSSL EVP_CIPHER_CTX mContext; #endif @@ -61,7 +62,6 @@ protected: SECItem* mSecParam; PK11SymKey* mSymKey; #endif - CryptoType mType; #if USE_TLS_OPENSSL const EVP_CIPHER* getCipher(CryptoType type); diff --git a/oox/source/crypto/CryptTools.cxx b/oox/source/crypto/CryptTools.cxx index 6994ca42f4ae..1d8a432ae2b8 100644 --- a/oox/source/crypto/CryptTools.cxx +++ b/oox/source/crypto/CryptTools.cxx @@ -16,8 +16,13 @@ namespace core { using namespace std; -Crypto::Crypto(CryptoType type) : - mType(type) +Crypto::Crypto(CryptoType type) + : mType(type) +#if USE_TLS_NSS + , mContext(NULL) + , mSecParam(NULL) + , mSymKey(NULL) +#endif { #if USE_TLS_NSS // Initialize NSS, database functions are not needed |