From f879f7125f12f9a7fde0175b4f1fcc3c1686e642 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 12 Mar 2018 11:35:37 +0000 Subject: forcepoint #25 ensure null termination MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I37f4787fb5772e959c45280d9650adcc15591033 Reviewed-on: https://gerrit.libreoffice.org/51128 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- vcl/unx/generic/printer/jobdata.cxx | 14 +++++++++----- 1 file 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 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 aRemain(nBytes+1); + nBytes = aStream.ReadBytes(aRemain.data(), nBytes); + if (nBytes) + { + aRemain[nBytes] = 0; + rJobData.m_aContext.rebuildFromStreamBuffer(aRemain.data(), nBytes); + bContext = true; + } } } } -- cgit