diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-03-12 11:35:37 +0000 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2018-06-01 14:26:42 +0200 |
| commit | d28a87a3293a5afd3b80d0bb677e0bcd98f23d2f (patch) | |
| tree | b754565ab5f450b27d951a603a1e285a57abafc6 | |
| parent | ac139d058d7e0761c739013b8ae748ede2487b91 (diff) | |
forcepoint #25 ensure null termination
Change-Id: I37f4787fb5772e959c45280d9650adcc15591033
Reviewed-on: https://gerrit.libreoffice.org/51130
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | vcl/unx/generic/printer/jobdata.cxx | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/vcl/unx/generic/printer/jobdata.cxx b/vcl/unx/generic/printer/jobdata.cxx index aead34c96eb1..c15424df2e0d 100644 --- a/vcl/unx/generic/printer/jobdata.cxx +++ b/vcl/unx/generic/printer/jobdata.cxx @@ -274,11 +274,15 @@ bool JobData::constructFromStreamBuffer( void* pData, sal_uInt32 bytes, JobData& if( rJobData.m_pParser ) { rJobData.m_aContext.setParser( rJobData.m_pParser ); - const sal_uInt64 nBytes = bytes - aStream.Tell(); - std::unique_ptr<char[]> pRemain(new char[bytes - aStream.Tell()]); - aStream.Read( pRemain.get(), nBytes ); - rJobData.m_aContext.rebuildFromStreamBuffer( pRemain.get(), nBytes ); - bContext = true; + sal_uInt64 nBytes = bytes - aStream.Tell(); + std::vector<char> aRemain(nBytes+1); + nBytes = aStream.Read(aRemain.data(), nBytes); + if (nBytes) + { + aRemain[nBytes] = 0; + rJobData.m_aContext.rebuildFromStreamBuffer(aRemain.data(), nBytes); + bContext = true; + } } } } |