diff options
| author | Matthew J. Francis <mjay.francis@gmail.com> | 2014-09-20 12:14:41 +0800 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2014-09-22 05:15:53 +0000 |
| commit | 764e3016b62665281539af4e990ca4ff0445c26c (patch) | |
| tree | f5ec6b10fa76e3f622d26095981e5c1a92c2485f /vcl/source/gdi | |
| parent | 935e8fc98c033680029e4531747a2f680f50d5ca (diff) | |
fdo#84086 Fix assorted use-after-free bugs
Change-Id: Iec004fffdb0afbe27bd69f379db90f6d904a8a65
Reviewed-on: https://gerrit.libreoffice.org/11553
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl/source/gdi')
| -rw-r--r-- | vcl/source/gdi/pdfwriter_impl.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index c73d3e22d206..100685d62aef 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -6039,7 +6039,7 @@ bool PDFWriterImpl::finalizeSignature() HASH_End(hc.get(), digest.data, &digest.len, SHA1_LENGTH); hc.clear(); - const char *pass = OUStringToOString( m_aContext.SignPassword, RTL_TEXTENCODING_UTF8 ).getStr(); + OString pass = OUStringToOString( m_aContext.SignPassword, RTL_TEXTENCODING_UTF8 ); NSSCMSMessage *cms_msg = NSS_CMSMessage_Create(NULL); if (!cms_msg) @@ -6116,7 +6116,7 @@ bool PDFWriterImpl::finalizeSignature() NSSCMSEncoderContext *cms_ecx; //FIXME: Check if password is passed correctly to SEC_PKCS7CreateSignedData function - cms_ecx = NSS_CMSEncoder_Start(cms_msg, NULL, NULL, &cms_output, arena, (PK11PasswordFunc)::PDFSigningPKCS7PasswordCallback, (void *)pass, NULL, NULL, NULL, NULL); + cms_ecx = NSS_CMSEncoder_Start(cms_msg, NULL, NULL, &cms_output, arena, (PK11PasswordFunc)::PDFSigningPKCS7PasswordCallback, (void *)pass.getStr(), NULL, NULL, NULL, NULL); if (!cms_ecx) { |