[Libreoffice-commits] core.git: vcl/source

[Caolán McNamara (via logerrit)]

 vcl/source/gdi/jobset.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0bd5b0f92c10db2da04ad8ee7de8e11534df046e
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Mon Oct 30 16:49:11 2023 +0000
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Oct 31 06:16:19 2023 +0100

    ofz#63741 Unknown Read
    
    this went wrong in
    
    commit d97e0458914991214e3d396273862855aff66234
    Date:   Mon Oct 1 03:09:35 2018 +0200
    
        vcl: no raw pointers
    
    where
    
    rJobData.SetDriverDataLen()
    
    was dropped
    
    in favour of using using nDriverDataLen, but missed replacing an interleaved
    GetDriverDataLen() with nDriverDataLen
    
    Change-Id: Iebc9145865fa4ec985bc2feed754c775d77011b2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158671
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx
index c9ed0d9626ec..19fa712ea658 100644
--- a/vcl/source/gdi/jobset.cxx
+++ b/vcl/source/gdi/jobset.cxx
@@ -297,7 +297,7 @@ SvStream& ReadJobSetup( SvStream& rIStream, JobSetup& 
rJobSetup )
                 if ( nDriverDataLen )
                 {
                     const char* pDriverData = reinterpret_cast<const 
char*>(pOldJobData) + nOldJobDataSize;
-                    const char* pDriverDataEnd = pDriverData + 
rJobData.GetDriverDataLen();
+                    const char* pDriverDataEnd = pDriverData + nDriverDataLen;
                     if (pDriverDataEnd > pTempBuf.get() + nRead)
                     {
                         SAL_WARN("vcl", "corrupted job setup");