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

2013-01-25 Thread Julien Nabet (via Code Review) 
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/1851

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/51/1851/1

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

Change-Id: Ia86ec2f32259180a29857eee53d6d5c082e05bf7
Reviewed-on: https://gerrit.libreoffice.org/1788
Reviewed-by: Radek Doulík r...@novell.com
Tested-by: Radek Doulík r...@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/1851
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia86ec2f32259180a29857eee53d6d5c082e05bf7
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Julien Nabet serval2...@yahoo.fr
Gerrit-Reviewer: Radek Doulík r...@novell.com

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2013-01-25 Thread Julien Nabet (via Code Review) 
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 r...@novell.com
Tested-by: Radek Doulík r...@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 serval2...@yahoo.fr
Gerrit-Reviewer: Radek Doulík r...@novell.com

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice