vcl/source/gdi/jobset.cxx | 7 +++++++
1 file changed, 7 insertions(+)
New commits:
commit ab3829bf74667044d9b0f5b96903bbafda5171f6
Author: Caolán McNamara <[email protected]>
AuthorDate: Wed Dec 30 21:19:15 2020 +0000
Commit: Caolán McNamara <[email protected]>
CommitDate: Fri Jan 1 17:07:53 2021 +0100
ofz#29113 short read
Change-Id: I107d8abeac419ba4e70a5880054c9195c60464ad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108527
Tested-by: Caolán McNamara <[email protected]>
Reviewed-by: Caolán McNamara <[email protected]>
diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx
index a382dc6a062d..5777e1faa044 100644
--- a/vcl/source/gdi/jobset.cxx
+++ b/vcl/source/gdi/jobset.cxx
@@ -266,6 +266,13 @@ SvStream& ReadJobSetup( SvStream& rIStream, JobSetup&
rJobSetup )
if ( nSystem == JOBSET_FILE364_SYSTEM ||
nSystem == JOBSET_FILE605_SYSTEM )
{
+ if (nRead < sizeof(ImplOldJobSetupData) +
sizeof(Impl364JobSetupData))
+ {
+ SAL_WARN("vcl", "Parsing error: " <<
sizeof(ImplOldJobSetupData) + sizeof(Impl364JobSetupData) <<
+ " required, but " << nRead << " available");
+ return rIStream;
+ }
+
Impl364JobSetupData* pOldJobData =
reinterpret_cast<Impl364JobSetupData*>(pTempBuf.get() + sizeof(
ImplOldJobSetupData ));
sal_uInt16 nOldJobDataSize = SVBT16ToUInt16(
pOldJobData->nSize );
rJobData.SetSystem( SVBT16ToUInt16( pOldJobData->nSystem ) );
_______________________________________________
Libreoffice-commits mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
