summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-03-12 11:35:37 +0000
committerCaolán McNamara <caolanm@redhat.com>2018-03-12 18:09:19 +0100
commitf879f7125f12f9a7fde0175b4f1fcc3c1686e642 (patch)
treef75c5e274d4b7ed99c4e02b5bf28b286f7a34da6
parent43bf50d5ced4b878f747075f8c0f1b32991c290e (diff)
forcepoint #25 ensure null termination
Change-Id: I37f4787fb5772e959c45280d9650adcc15591033 Reviewed-on: https://gerrit.libreoffice.org/51128 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--vcl/unx/generic/printer/jobdata.cxx14
1 files changed, 9 insertions, 5 deletions
diff --git a/vcl/unx/generic/printer/jobdata.cxx b/vcl/unx/generic/printer/jobdata.cxx
index 1206a7b5efca..edf377e7665e 100644
--- a/vcl/unx/generic/printer/jobdata.cxx
+++ b/vcl/unx/generic/printer/jobdata.cxx
@@ -273,11 +273,15 @@ bool JobData::constructFromStreamBuffer( const void* pData, sal_uInt32 bytes, Jo
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.ReadBytes( 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.ReadBytes(aRemain.data(), nBytes);
+ if (nBytes)
+ {
+ aRemain[nBytes] = 0;
+ rJobData.m_aContext.rebuildFromStreamBuffer(aRemain.data(), nBytes);
+ bContext = true;
+ }
}
}
}