Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/1852

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/52/1852/1

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

Change-Id: I942dc0c574a9fb4ae676a86cfafafc6fd6283831
Reviewed-on: https://gerrit.libreoffice.org/1788
Reviewed-by: Radek Doulík <rodo@novell.com>
Tested-by: Radek Doulík <rodo@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 fa5b1ae..6da553b 100644
--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
@@ -534,8 +534,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/1852
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I942dc0c574a9fb4ae676a86cfafafc6fd6283831
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Julien Nabet <serval2412@yahoo.fr>
Gerrit-Reviewer: Radek Doulík <rodo@novell.com>


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.