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 /svl | |
| 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 'svl')
| -rw-r--r-- | svl/source/misc/strmadpt.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/svl/source/misc/strmadpt.cxx b/svl/source/misc/strmadpt.cxx index a55a0faa683d..bc7eaac93ca2 100644 --- a/svl/source/misc/strmadpt.cxx +++ b/svl/source/misc/strmadpt.cxx @@ -448,6 +448,8 @@ sal_uLong SvInputStream::GetData(void * pData, sal_uLong nSize) SetError(ERRCODE_IO_CANTREAD); return 0; } + // check if a truncated STREAM_SEEK_TO_END was passed + assert(m_nSeekedFrom != (sal_uInt64)(sal_uInt32)STREAM_SEEK_TO_END); sal_uInt32 nRead = 0; if (m_xSeekable.is()) { @@ -548,6 +550,8 @@ void SvInputStream::FlushData() // virtual sal_uInt64 SvInputStream::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 (open()) { if (nPos == STREAM_SEEK_TO_END) |