[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - connectivity/source

[Mike Kaganski (via logerrit)]

 connectivity/source/drivers/firebird/Blob.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit e7e38c23d0a91e80535893ee88e3f0062b7d522c
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Fri Sep 10 00:49:49 2021 +0200
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Fri Sep 10 09:49:05 2021 +0200

    tdf#120129: don't forget to update buffer size to actual length
    
    Otherwise extra bytes get written to the resulting string from the
    too long buffer.
    
    Change-Id: Iccde16b8002f214df6f86f484f288ec464c6b674
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121872
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
    (cherry picked from commit 541ddf4580cac8c3f9590be26a487f5fc8e2553c)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121875
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/connectivity/source/drivers/firebird/Blob.cxx 
b/connectivity/source/drivers/firebird/Blob.cxx
index 8ed9fc4a8ac7..854db5bb0df0 100644
--- a/connectivity/source/drivers/firebird/Blob.cxx
+++ b/connectivity/source/drivers/firebird/Blob.cxx
@@ -144,6 +144,9 @@ bool Blob::readOneSegment(uno::Sequence< sal_Int8 >& 
rDataOut)
         OUString sError(StatusVectorToString(m_statusVector, 
"isc_get_segment"));
         throw IOException(sError, *this);
     }
+
+    if (rDataOut.getLength() > nActualSize)
+        rDataOut.realloc(nActualSize);
     m_nBlobPosition += nActualSize;
     return aRet == isc_segstr_eof;  // last segment read
 }