fix crash during file format detection, related #i101863#

Change-Id: I2aec2e95f49ab70a9e94c5d52f70855f4381a24e

fix crash during file format detection, related #i101863#
Change-Id: I2aec2e95f49ab70a9e94c5d52f70855f4381a24e
db96add4 · Markus Mohrhard · Markus Mohrhard · 2bf2dee0 · db96add4
Kaydet (Commit) db96add4 authored Şub 10, 2014 tarafından Markus Mohrhard Kaydeden (comit) Markus Mohrhard Şub 10, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

CryptTools.cxx oox/source/crypto/CryptTools.cxx +4 -1

No files found.
--- 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;