From 59bce03256c5c00616cf63ace140cb91fdd46aa7 Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Sun, 20 Jan 2013 23:20:57 +0100 Subject: Resolves: fdo#49784 CRASH when FILEOPEN particular doc containing .svm MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ia86ec2f32259180a29857eee53d6d5c082e05bf7 Reviewed-on: https://gerrit.libreoffice.org/1788 Reviewed-by: Radek Doulík Tested-by: Radek Doulík --- drawinglayer/source/primitive2d/metafileprimitive2d.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx index f4337aa5847d..cef65006d0fb 100644 --- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx @@ -524,8 +524,9 @@ namespace TargetHolder& Current() { + static TargetHolder aDummy; OSL_ENSURE(maTargetHolders.size(), "TargetHolders: CURRENT with no property holders (!)"); - return *maTargetHolders.back(); + return maTargetHolders.empty() ? aDummy : *maTargetHolders.back(); } ~TargetHolders() -- cgit v1.2.3