oox/source/crypto/CryptTools.cxx | 2 ++ 1 file changed, 2 insertions(+)
New commits: commit 2c1cf211e830399ef70e1df94976871afc7c6b3e Author: Caolán McNamara <[email protected]> AuthorDate: Wed Aug 1 08:39:03 2018 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Thu Aug 2 11:49:43 2018 +0200 forcepoint#54 null deref Change-Id: I9ca04647b16f90bb2d2d4aa0d25b08a09c408fe0 Reviewed-on: https://gerrit.libreoffice.org/58383 Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]> diff --git a/oox/source/crypto/CryptTools.cxx b/oox/source/crypto/CryptTools.cxx index e0b39f67cca4..1de9fafc80e0 100644 --- a/oox/source/crypto/CryptTools.cxx +++ b/oox/source/crypto/CryptTools.cxx @@ -167,6 +167,8 @@ sal_uInt32 Decrypt::update(std::vector<sal_uInt8>& output, std::vector<sal_uInt8 #endif // USE_TLS_OPENSSL #if USE_TLS_NSS + if (!mContext) + return 0; (void)PK11_CipherOp( mContext, output.data(), &outputLength, actualInputLength, input.data(), actualInputLength ); #endif // USE_TLS_NSS _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
