summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2021-09-10 00:49:49 +0200
committerXisco Fauli <xiscofauli@libreoffice.org>2021-09-10 09:49:05 +0200
commite7e38c23d0a91e80535893ee88e3f0062b7d522c (patch)
tree7f6ecbb4b32c01304f0e1fbcd5ab5cd1d15f36e1
parentResolves: tdf#144376 focus into protected ScTextWnd shouldn't be possible (diff)
downloadcore-e7e38c23d0a91e80535893ee88e3f0062b7d522c.tar.gz
core-e7e38c23d0a91e80535893ee88e3f0062b7d522c.zip
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.kaganski@collabora.com> (cherry picked from commit 541ddf4580cac8c3f9590be26a487f5fc8e2553c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121875 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
-rw-r--r--connectivity/source/drivers/firebird/Blob.cxx3
1 files changed, 3 insertions, 0 deletions
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
}