oox/source/crypto/CryptTools.cxx | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 79180421cb1b8f5b94ca442d0cee57773466ceea
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Aug 1 08:39:03 2018 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Aug 1 12:31:36 2018 +0200
forcepoint#54 null deref
Change-Id: I9ca04647b16f90bb2d2d4aa0d25b08a09c408fe0
Reviewed-on: https://gerrit.libreoffice.org/58382
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/oox/source/crypto/CryptTools.cxx b/oox/source/crypto/CryptTools.cxx
index c507923f7bc9..99fb01fe88d2 100644
--- a/oox/source/crypto/CryptTools.cxx
+++ b/oox/source/crypto/CryptTools.cxx
@@ -288,6 +288,8 @@ sal_uInt32 Decrypt::update(std::vector<sal_uInt8>& output,
std::vector<sal_uInt8
#endif // USE_TLS_OPENSSL
#if USE_TLS_NSS
+ if (!mpImpl->mContext)
+ return 0;
(void)PK11_CipherOp(mpImpl->mContext, output.data(), &outputLength,
actualInputLength, input.data(), actualInputLength);
#endif // USE_TLS_NSS
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
