vcl/source/gdi/pdfwriter_impl.cxx | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
New commits:
commit 1fcc999a0cf530161de811fcb11177c61f59f44a
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Nov 8 10:27:50 2018 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Nov 8 15:29:09 2018 +0100
crash on export to pdf with password set
mostly since...
commit 47a173edb603538521a035157efb6ef684238087
Date: Sat Sep 15 18:36:08 2018 +0200
use std::vector in PDFWriterImpl for encryption buffer
instead of manual allocation and size field
though that nLen*2 cound was already wrong as it is actually nChars, which
is (nLen*2)+2,
its just that the initial 0x4000 size was bigger than that so we got away
with it
Change-Id: I445bef87b6ba45b2034a82fe457e4540258b92d5
Reviewed-on: https://gerrit.libreoffice.org/63078
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx
b/vcl/source/gdi/pdfwriter_impl.cxx
index a3b9db4908d0..e23bfdfb0ef9 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -1750,10 +1750,6 @@ void PDFWriterImpl::PDFPage::appendWaveLine( sal_Int32
nWidth, sal_Int32 nY, sal
/* prepare the cypher engine, can be done in CTOR, free in DTOR */
m_aCipher = rtl_cipher_createARCFOUR( rtl_Cipher_ModeStream );
- /* the size of the Codec default maximum */
- /* is this 0x4000 required to be the same as MAX_SIGNATURE_CONTENT_LENGTH
or just coincidentally the same at the moment? */
- m_vEncryptionBuffer.reserve(0x4000);
-
if( xEnc.is() )
prepareEncryption( xEnc );
@@ -1992,7 +1988,6 @@ inline void
PDFWriterImpl::appendUnicodeTextStringEncrypt( const OUString& rInSt
const sal_Unicode* pStr = rInString.getStr();
sal_Int32 nLen = rInString.getLength();
//prepare a unicode string, encrypt it
- m_vEncryptionBuffer.reserve(nLen*2);
enableStringEncryption( nInObjectNumber );
sal_uInt8 *pCopy = m_vEncryptionBuffer.data();
sal_Int32 nChars = 2;
@@ -2007,6 +2002,7 @@ inline void
PDFWriterImpl::appendUnicodeTextStringEncrypt( const OUString& rInSt
nChars += 2;
}
//encrypt in place
+ m_vEncryptionBuffer.resize(nChars);
rtl_cipher_encodeARCFOUR( m_aCipher, m_vEncryptionBuffer.data(),
nChars, m_vEncryptionBuffer.data(), nChars );
//now append, hexadecimal (appendHex), the encrypted result
for(int i = 0; i < nChars; i++)
@@ -2024,7 +2020,7 @@ inline void PDFWriterImpl::appendLiteralStringEncrypt(
OStringBuffer const & rIn
//check for encryption, if ok, encrypt the string, then convert with
appndLiteralString
if( m_aContext.Encryption.Encrypt() )
{
- m_vEncryptionBuffer.reserve( nChars );
+ m_vEncryptionBuffer.resize(nChars);
//encrypt the string in a buffer, then append it
enableStringEncryption( nInObjectNumber );
rtl_cipher_encodeARCFOUR( m_aCipher, rInString.getStr(), nChars,
m_vEncryptionBuffer.data(), nChars );
@@ -2147,7 +2143,7 @@ bool PDFWriterImpl::writeBuffer( const void* pBuffer,
sal_uInt64 nBytes )
if( m_bEncryptThisStream )
{
/* implement the encryption part of the PDF spec encryption
algorithm 3.1 */
- m_vEncryptionBuffer.reserve( nBytes );
+ m_vEncryptionBuffer.resize(nBytes);
if( buffOK )
rtl_cipher_encodeARCFOUR( m_aCipher,
pBuffer,
static_cast<sal_Size>(nBytes),
@@ -9518,7 +9514,7 @@ bool PDFWriterImpl::writeBitmapObject( BitmapEmit&
rObject, bool bMask )
{
enableStringEncryption( rObject.m_nObject );
//check encryption buffer size
- m_vEncryptionBuffer.reserve( pAccess->GetPaletteEntryCount()*3
);
+ m_vEncryptionBuffer.resize(pAccess->GetPaletteEntryCount()*3);
int nChar = 0;
//fill the encryption buffer
for( sal_uInt16 i = 0; i < pAccess->GetPaletteEntryCount();
i++ )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
