summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-08-27 13:58:48 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-08-27 14:45:03 +0100
commit1830b4f2e324090962a993315ce76752d24d4088 (patch)
tree865dc6bdb3f8fc8f42c725b56a5f8dfd2f579570
parentd417ffb7dd93306be7c89526a75acab53dbd8831 (diff)
check seek for success
Change-Id: I02420ffb3af009d08ce54a0932e2c7a287703a72
-rw-r--r--sd/qa/unit/data/ppt/pass/hang-7.pptbin0 -> 7691 bytes
-rw-r--r--sd/source/filter/ppt/propread.cxx6
2 files changed, 5 insertions, 1 deletions
diff --git a/sd/qa/unit/data/ppt/pass/hang-7.ppt b/sd/qa/unit/data/ppt/pass/hang-7.ppt
new file mode 100644
index 000000000000..8c05271f9b63
--- /dev/null
+++ b/sd/qa/unit/data/ppt/pass/hang-7.ppt
Binary files differ
diff --git a/sd/source/filter/ppt/propread.cxx b/sd/source/filter/ppt/propread.cxx
index f8804fd8f601..86195be46364 100644
--- a/sd/source/filter/ppt/propread.cxx
+++ b/sd/source/filter/ppt/propread.cxx
@@ -419,7 +419,11 @@ void Section::Read( SotStorageStream *pStrm )
if ( nPropSize )
{
if ( ( nVectorCount - i ) > 1 )
- pStrm->Seek( nPropOfs + nSecOfs + nPropSize );
+ {
+ nOffset = nPropOfs + nSecOfs + nPropSize;
+ if (nOffset != pStrm->Seek(nOffset))
+ break;
+ }
}
else
break;