summaryrefslogtreecommitdiff
path: root/sd/source/filter/ppt/propread.hxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-09-18 12:46:29 +0100
committerAndras Timar <andras.timar@collabora.com>2015-10-02 14:58:31 +0200
commit182bd71df302f768928357febab70bc6233761e6 (patch)
treea7142d0e8c10191ad7d041bfabf526191fd30de3 /sd/source/filter/ppt/propread.hxx
parentd8b2bac2c962e08684366e8422d52e3c46ba7712 (diff)
check stream status and string lengths
(cherry picked from commit 7af19f45b35c428d3e06972806e5a05489f45955) if nSize was 1 with unicode encoding nSize would wrap around in lcl_getMaxSafeStrLen (cherry picked from commit f6368c29bdc3a9017bcae3f064d2cd8c7e37ed10) rework this so we don't read the string, backup and re-read the string again (cherry picked from commit 8523e57e427ef5b0b7f7067dcdd07f01176d2160) Change-Id: I99f3d4a2ec760228f485d01fce856deb9c068431 Reviewed-on: https://gerrit.libreoffice.org/18691 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'sd/source/filter/ppt/propread.hxx')
-rw-r--r--sd/source/filter/ppt/propread.hxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sd/source/filter/ppt/propread.hxx b/sd/source/filter/ppt/propread.hxx
index 7d2ea78f2581..92219d0e021d 100644
--- a/sd/source/filter/ppt/propread.hxx
+++ b/sd/source/filter/ppt/propread.hxx
@@ -145,8 +145,8 @@ class Section
Section( const Section& rSection );
Section& operator=( const Section& rSection );
- bool GetProperty( sal_uInt32 nId, PropItem& rPropItem );
- bool GetDictionary( Dictionary& rDict );
+ bool GetProperty( sal_uInt32 nId, PropItem& rPropItem );
+ void GetDictionary( Dictionary& rDict );
const sal_uInt8* GetFMTID() const { return aFMTID; };
void Read( SvStorageStream* pStrm );
};