diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-08-01 08:39:03 +0100 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2019-11-29 07:51:43 +0100 |
| commit | 6837ea0f761991054030f61411e5ffdf82d11073 (patch) | |
| tree | 76ea9c0c0c1a7e065642e956709f7ebdb0735462 /oox | |
| parent | 5c28ca21245f1153f2476d6b9b3732c5d5b3848b (diff) | |
forcepoint#54 null deref
Change-Id: I9ca04647b16f90bb2d2d4aa0d25b08a09c408fe0
Reviewed-on: https://gerrit.libreoffice.org/58383
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 2c1cf211e830399ef70e1df94976871afc7c6b3e)
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/crypto/CryptTools.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/oox/source/crypto/CryptTools.cxx b/oox/source/crypto/CryptTools.cxx index f1d4e9a8bf77..173d46e5787f 100644 --- a/oox/source/crypto/CryptTools.cxx +++ b/oox/source/crypto/CryptTools.cxx @@ -155,6 +155,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 |