[PATCH] Change in core[libreoffice-4-0]: Resolves: fdo#49784 CRASH when FILEOPEN particular doc conta...

[Julien Nabet (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/1853

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/53/1853/1

Resolves: fdo#49784 CRASH when FILEOPEN particular doc containing .svm

Change-Id: I07123e35c7468597b2cba69162bd98e4b81b54b6
Reviewed-on: https://gerrit.libreoffice.org/1788
Reviewed-by: Radek Doulík <rodo at novell.com>
Tested-by: Radek Doulík <rodo at novell.com>
---
M drawinglayer/source/primitive2d/metafileprimitive2d.cxx
1 file changed, 2 insertions(+), 1 deletion(-)



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 @@
 
         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()

-- 
To view, visit https://gerrit.libreoffice.org/1853
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I07123e35c7468597b2cba69162bd98e4b81b54b6
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Julien Nabet <serval2412 at yahoo.fr>
Gerrit-Reviewer: Radek Doulík <rodo at novell.com>