summaryrefslogtreecommitdiff
path: root/vcl/source/gdi
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2015-03-12 00:31:18 +0200
committerTor Lillqvist <tml@collabora.com>2015-03-12 00:47:22 +0200
commit6bcbcb21faed17e529591f29aa0e492600f49ec3 (patch)
tree5a8aedd61c06934a6ee5318833fca98408047cc1 /vcl/source/gdi
parenta7d335746e6ab6807b39719d9cf15335e67082f9 (diff)
Fix crash when timestamping PDF signature
Using the NSS API for CMS and ASN.1-based stuff in general correctly is extremely hard. It is very easy to do things slightly wrong. Of course no compiler warnings are produced. You just get code that happens to work by accident when compiled with one compiler, but not another, or depending on contents of uninitialised memory, or the phase of the moon. The problem was that the "values" field of a NSSCMSAttribute struct apparently is supposed to point to *two* SECItem pointers, one pointing to the actual value, and a NULL one. Anyway, now valgrind finally does not complain about any use of uninitialised memory. Most likely my earlier recent commits to this file were not necessary after all. They just seemed to help by accident, at least at one stage. But whatever... Change-Id: Ic98401b5d151bbb2398f809f47699f670e9720fa
Diffstat (limited to 'vcl/source/gdi')
-rw-r--r--vcl/source/gdi/pdfwriter_impl.cxx9
1 files changed, 7 insertions, 2 deletions
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index f815d9940e50..296a76a6dfd2 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -6857,7 +6857,9 @@ bool PDFWriterImpl::finalizeSignature()
SECItem response_item;
NSSCMSAttribute timestamp;
SECItem values[2];
- SECItem *valuesp = values;
+ SECItem *valuesp[2];
+ valuesp[0] = values;
+ valuesp[1] = NULL;
SECOidData typetag;
if( !m_aContext.SignTSA.isEmpty() )
@@ -7114,12 +7116,15 @@ bool PDFWriterImpl::finalizeSignature()
// timestamp.type filled in below
+ // Not sure if we actually need two entries in the values array, now when valuesp is an
+ // array too, the pointer to the values array followed by a null pointer. But I don't feel
+ // like experimenting.
values[0] = response.timeStampToken;
values[1].type = siBuffer;
values[1].data = NULL;
values[1].len = 0;
- timestamp.values = &valuesp;
+ timestamp.values = valuesp;
typetag.oid.data = NULL;
// id-aa-timeStampToken OBJECT IDENTIFIER ::= { iso(1)