[openoffice.org/f13/master] Resolves: rhbz#674330 dereference of NULL mpBase

[Caolan McNamara]

commit 795dbf0c773c6948b17c50a41bfca34354c3d4b0
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Feb 16 16:47:37 2011 +0000

    Resolves: rhbz#674330 dereference of NULL mpBase

 ...es-rhbz-674330-dereference-of-NULL-mpBase.patch |   27 ++++++++++++++++++++
 openoffice.org.spec                                |    7 ++++-
 2 files changed, 33 insertions(+), 1 deletions(-)
---
diff --git a/0001-Resolves-rhbz-674330-dereference-of-NULL-mpBase.patch b/0001-Resolves-rhbz-674330-dereference-of-NULL-mpBase.patch
new file mode 100644
index 0000000..ea20d29
--- /dev/null
+++ b/0001-Resolves-rhbz-674330-dereference-of-NULL-mpBase.patch
@@ -0,0 +1,27 @@
+From 1a9c37ac56b97aaf7535bff7bd2fb84b13ef8e50 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at 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
+
diff --git a/openoffice.org.spec b/openoffice.org.spec
index 6f0689d..b09b4bf 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 12
-%define rh_rpm_release 35
+%define rh_rpm_release 36
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -189,6 +189,7 @@ Patch118: workspace.mav56.patch
 Patch119: workspace.hb22.patch
 Patch120: workspace.os145.patch
 Patch121: workspace.impress208.patch
+Patch122: 0001-Resolves-rhbz-674330-dereference-of-NULL-mpBase.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1808,6 +1809,7 @@ cp -p %{SOURCE5} external/unowinreg/unowinreg.dll
 %patch119 -p1 -b .workspace.hb22.patch
 %patch120 -p1 -b .workspace.os145.patch
 %patch121 -p1 -b .workspace.impress208.patch
+%patch122 -p1 -b .rhbz674330-dereference-of-NULL-mpBase.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4293,6 +4295,9 @@ fi
 %endif
 
 %changelog
+* Wed Feb 16 2011 Caolán McNamara <caolanm at redhat.com>- 1:3.2.0-12.36-UNBUILT
+- Resolves: rhbz#674330 dereference of NULL mpBase
+
 * Thu Jan 27 2011 Caolán McNamara <caolanm at redhat.com>- 1:3.2.0-12.35
 - CVE-2010-3450 Extensions and filter package files
 - CVE-2010-3451 / CVE-2010-3452 RTF documents