diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-12-02 14:51:09 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-12-02 14:54:13 +0000 |
| commit | a757e1b1300dde12fb865c1efd64bfd2bef00e2c (patch) | |
| tree | ff15a2ce6ae4420880a4313ac2560264c699154e /oox | |
| parent | 214ab2c15e1fcdd0b1d6fa32ee0e101fb53a988c (diff) | |
Resolves: fdo#70157 fix crash on loading
Change-Id: I0d248a195852c14cd95d4e337823076dd2fbc19d
(cherry picked from commit 8302d048653d9ac25d3cb9ab9277df715053ad6a)
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/vml/vmlformatting.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/oox/source/vml/vmlformatting.cxx b/oox/source/vml/vmlformatting.cxx index 40569703c1e5..c6859b5b5e3b 100644 --- a/oox/source/vml/vmlformatting.cxx +++ b/oox/source/vml/vmlformatting.cxx @@ -373,9 +373,13 @@ void ConversionHelper::decodeVmlPath( ::std::vector< ::std::vector< Point > >& r break; case CLOSE: // 0 param - rPointLists.back().push_back( rPointLists.back()[ 0 ] ); - rFlagLists.back().push_back( rFlagLists.back()[ 0 ] ); - aCurrentPoint = rPointLists.back().back(); + SAL_WARN_IF(rPointLists.back().empty() || rPointLists.back().empty(), "oox", "empty pointlists at close"); + if (!rPointLists.back().empty() && !rFlagLists.back().empty()) + { + rPointLists.back().push_back( rPointLists.back()[ 0 ] ); + rFlagLists.back().push_back( rFlagLists.back()[ 0 ] ); + aCurrentPoint = rPointLists.back().back(); + } break; case END: // 0 param |