6.mga1/SOURCES/0001-Resolves-rhbz-674330-dereference-of-NULL-mpBase.patch

From 1a9c37ac56b97aaf7535bff7bd2fb84b13ef8e50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Wed, 16 Feb 2011 16:45:48 +0000
Subject: [PATCH] Resolves: rhbz#674330 dereference of NULL mpBase

---
 sd/source/ui/unoidl/DrawController.cxx |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx
index 6f3c1e1..f64b649 100644
--- a/sd/source/ui/unoidl/DrawController.cxx
+++ b/sd/source/ui/unoidl/DrawController.cxx
@@ -166,7 +166,9 @@ void SAL_CALL DrawController::dispose (void)
         {
             mbDisposing = true;
 
-            boost::shared_ptr<ViewShell> pViewShell = mpBase->GetMainViewShell();
+            boost::shared_ptr<ViewShell> pViewShell;
+            if (mpBase)
+                pViewShell = mpBase->GetMainViewShell();
             if ( pViewShell )
             {
                 pViewShell->DeactivateCurrentFunction();
-- 
1.7.4

1	From 1a9c37ac56b97aaf7535bff7bd2fb84b13ef8e50 Mon Sep 17 00:00:00 2001
2	From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
3	Date: Wed, 16 Feb 2011 16:45:48 +0000
4	Subject: [PATCH] Resolves: rhbz#674330 dereference of NULL mpBase
5
6	---
7	sd/source/ui/unoidl/DrawController.cxx \| 4 +++-
8	1 files changed, 3 insertions(+), 1 deletions(-)
9
10	diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx
11	index 6f3c1e1..f64b649 100644
12	--- a/sd/source/ui/unoidl/DrawController.cxx
13	+++ b/sd/source/ui/unoidl/DrawController.cxx
14	@@ -166,7 +166,9 @@ void SAL_CALL DrawController::dispose (void)
15	{
16	mbDisposing = true;
17
18	- boost::shared_ptr<ViewShell> pViewShell = mpBase->GetMainViewShell();
19	+ boost::shared_ptr<ViewShell> pViewShell;
20	+ if (mpBase)
21	+ pViewShell = mpBase->GetMainViewShell();
22	if ( pViewShell )
23	{
24	pViewShell->DeactivateCurrentFunction();
25	--
26	1.7.4
27