[Libreoffice-commits] .: Branch 'libreoffice-4-0' - drawinglayer/source

Mon Jan 28 00:46:44 PST 2013

drawinglayer/source/primitive2d/metafileprimitive2d.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 5ca5a5dd124f68c8a5667d86d6a0dbbd49a5f911
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sun Jan 20 23:20:57 2013 +0100

    Resolves: fdo#49784 CRASH when FILEOPEN particular doc containing .svm
    
    (cherry picked from commit 59bce03256c5c00616cf63ace140cb91fdd46aa7)
    
    Change-Id: Ia86ec2f32259180a29857eee53d6d5c082e05bf7
    Reviewed-by: Radek DoulÃk <rodo at novell.com>
    Tested-by: Radek DoulÃk <rodo at novell.com>

diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
index d168bef..7631601 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()
