diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-02-11 00:08:24 +0100 |
|---|---|---|
| committer | Kohei Yoshida <libreoffice@kohei.us> | 2014-02-11 03:52:32 +0000 |
| commit | d3d5ff30d6c1de6a522d29a09d1fee37d01a3b71 (patch) | |
| tree | bf2fa917f1ed81699b7bb9e23e90341b3cf67218 | |
| parent | 0217136b204466181765fb63d8ef55fecda5b4be (diff) | |
fix crash during file format detection, related #i101863#
Change-Id: I2aec2e95f49ab70a9e94c5d52f70855f4381a24e
Reviewed-on: https://gerrit.libreoffice.org/7986
Tested-by: Kohei Yoshida <libreoffice@kohei.us>
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
| -rw-r--r-- | oox/source/crypto/CryptTools.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/oox/source/crypto/CryptTools.cxx b/oox/source/crypto/CryptTools.cxx index 6c46297e3787..d9ba500e905d 100644 --- a/oox/source/crypto/CryptTools.cxx +++ b/oox/source/crypto/CryptTools.cxx @@ -61,7 +61,10 @@ void Crypto::setupContext(vector<sal_uInt8>& key, vector<sal_uInt8>& iv, CryptoT SECItem ivItem; ivItem.type = siBuffer; - ivItem.data = &iv[0]; + if(iv.empty()) + ivItem.data = NULL; + else + ivItem.data = &iv[0]; ivItem.len = iv.size(); SECItem* pIvItem = NULL; |