diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-03-30 22:31:53 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-03-30 22:41:48 +0200 |
| commit | ba46f32c804e665741a6db6f2578a01045304d14 (patch) | |
| tree | a0f140454829c8179264f309cdae8a8367911834 /sot | |
| parent | 1b40966fd0dd7e30c9fff40cc0dfcc15c3456221 (diff) | |
deploy some asserts to detect truncated STREAM_SEEK_TO_END
Since STREAM_SEEK_TO_END is now 64 bits it could happen that some
existing code uses it in some indirect manner and it gets truncated to
32 bits somewhere (on 32 bit platforms); try to detect that with asserts.
Of course the checked value is now a valid stream position, so
perhaps the checks should eventually be removed.
Change-Id: I4248c00d758220bdc3ee94c7aa7a7bd4c86c57f0
Diffstat (limited to 'sot')
| -rw-r--r-- | sot/source/sdstor/stgstrms.cxx | 2 | ||||
| -rw-r--r-- | sot/source/sdstor/ucbstorage.cxx | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/sot/source/sdstor/stgstrms.cxx b/sot/source/sdstor/stgstrms.cxx index fcd196131761..214b32ebda52 100644 --- a/sot/source/sdstor/stgstrms.cxx +++ b/sot/source/sdstor/stgstrms.cxx @@ -1283,6 +1283,8 @@ sal_uLong StgTmpStrm::PutData( const void* pData, sal_uLong n ) sal_uInt64 StgTmpStrm::SeekPos(sal_uInt64 n) { + // check if a truncated STREAM_SEEK_TO_END was passed + assert(n != (sal_uInt64)(sal_uInt32)STREAM_SEEK_TO_END); if( n == STREAM_SEEK_TO_END ) n = GetSize(); if( n && n > THRESHOLD && !pStrm ) diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx index 8c0be298bfb7..deb5303eb1b4 100644 --- a/sot/source/sdstor/ucbstorage.cxx +++ b/sot/source/sdstor/ucbstorage.cxx @@ -941,6 +941,9 @@ sal_uLong UCBStorageStream_Impl::PutData( const void* pData, sal_uLong nSize ) sal_uInt64 UCBStorageStream_Impl::SeekPos(sal_uInt64 const nPos) { + // check if a truncated STREAM_SEEK_TO_END was passed + assert(nPos != (sal_uInt64)(sal_uInt32)STREAM_SEEK_TO_END); + if( !Init() ) return 0; |