summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-02-22 21:22:34 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-02-23 08:49:29 +0100
commit27728d21e479007a7534e2759e464ebfe10a4e70 (patch)
tree9c8fd21f68021521232fdfd7286c167d9ce743e8 /oox
parent82ea4fdc37c475c4a39842341b6f236c689ff755 (diff)
Better make the zero-initialization more explicit
...if initializing these members is necessary at all; a bit hard to tell from the code. Change-Id: If15fb11b601ba3b8b5d3fdbe5c3dac01b095fb05
Diffstat (limited to 'oox')
-rw-r--r--oox/source/crypto/DocumentDecryption.cxx7
1 files changed, 6 insertions, 1 deletions
diff --git a/oox/source/crypto/DocumentDecryption.cxx b/oox/source/crypto/DocumentDecryption.cxx
index f93f9031f260..0209f3d24ba5 100644
--- a/oox/source/crypto/DocumentDecryption.cxx
+++ b/oox/source/crypto/DocumentDecryption.cxx
@@ -191,9 +191,14 @@ bool DocumentDecryption::generateEncryptionKey(const OUString& rPassword)
bool DocumentDecryption::readAgileEncryptionInfo(Reference< XInputStream >& xInputStream)
{
- AgileEngine* engine = new AgileEngine();
+ AgileEngine* engine = new AgileEngine;
mEngine.reset(engine);
AgileEncryptionInfo& info = engine->getInfo();
+ info.spinCount = 0;
+ info.saltSize = 0;
+ info.keyBits = 0;
+ info.hashSize = 0;
+ info.blockSize = 0;
Reference<XFastDocumentHandler> xFastDocumentHandler( new AgileDocumentHandler(info) );
Reference<XFastTokenHandler> xFastTokenHandler ( new AgileTokenHandler );