diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-07-11 09:57:47 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-07-11 12:55:47 +0200 |
| commit | 00850e3fa71cc9ebeacad65f54a98b9a79a8b183 (patch) | |
| tree | 69fef16ff20bb6e8b74d093bb3a31201bb72ceb8 /package | |
| parent | ce795510d3de7beb6bcd39954280bc3b5778ec6e (diff) | |
clean up UNO available() implementations
There seems to be some confusion here. available() is actually the
number of bytes that can be read without blocking, but most
implementations seems to be just returning the number of bytes remaining
in the stream. Since we're doing that, let's do it properly.
(*) some of them were just casting, instead of clamping, which will
return wrong values sometimes.
(*) FileStreamWrapper_Impl/OInputStreamWrapper/OTempFileService were
doing unnecessary work, instead of just asking the underlying SvStream
for it's remaining size
Change-Id: I3ef26e0363e989ed3e00be0fdb993e1cdeb7819f
Reviewed-on: https://gerrit.libreoffice.org/57264
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'package')
| -rw-r--r-- | package/source/zippackage/ZipPackageBuffer.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/source/zippackage/ZipPackageBuffer.cxx b/package/source/zippackage/ZipPackageBuffer.cxx index 8df0f3a96c9b..741c86629038 100644 --- a/package/source/zippackage/ZipPackageBuffer.cxx +++ b/package/source/zippackage/ZipPackageBuffer.cxx @@ -76,7 +76,7 @@ void SAL_CALL ZipPackageBuffer::skipBytes( sal_Int32 nBytesToSkip ) } sal_Int32 SAL_CALL ZipPackageBuffer::available( ) { - return static_cast < sal_Int32 > (m_nEnd - m_nCurrent); + return std::min<sal_Int64>(SAL_MAX_INT32, m_nEnd - m_nCurrent); } void SAL_CALL ZipPackageBuffer::closeInput( ) { |