[openoffice.org/f14/master] Resolves: rhbz#684620 crash with NULL pTableBox

[Caolan McNamara]

commit c20b4facc6fa44d20a92552e8a73b0a4d7747ef2
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Mar 14 11:34:09 2011 +0000

    Resolves: rhbz#684620 crash with NULL pTableBox

 ...ves-rhbz-684620-crash-with-NULL-pTableBox.patch |   25 ++++++++++++++++++++
 openoffice.org.spec                                |    3 ++
 2 files changed, 28 insertions(+), 0 deletions(-)
---
diff --git a/0001-Resolves-rhbz-684620-crash-with-NULL-pTableBox.patch b/0001-Resolves-rhbz-684620-crash-with-NULL-pTableBox.patch
new file mode 100644
index 0000000..4080700
--- /dev/null
+++ b/0001-Resolves-rhbz-684620-crash-with-NULL-pTableBox.patch
@@ -0,0 +1,25 @@
+From 7c4571adca053a2eb6229d0519f05520af28bbf7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
+Date: Mon, 14 Mar 2011 11:29:11 +0000
+Subject: [PATCH] Resolves: rhbz#684620 crash with NULL pTableBox
+
+---
+ sw/source/core/crsr/swcrsr.cxx |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
+index afdcc92..2f731bf 100644
+--- a/sw/source/core/crsr/swcrsr.cxx
++++ b/sw/source/core/crsr/swcrsr.cxx
+@@ -1701,7 +1701,7 @@ BOOL SwCursor::LeftRight( BOOL bLeft, USHORT nCnt, USHORT nMode,
+         if ( pTableBoxStartNode )
+         {
+             const SwTableBox* pTableBox = pTableBoxStartNode->GetTblBox();
+-            if ( pTableBox->getRowSpan() < 1 )
++            if ( pTableBox && pTableBox->getRowSpan() < 1 )
+             {
+                 // Store the row span offset:
+                 mnRowSpanOffset = pTableBox->getRowSpan();
+-- 
+1.7.4.1
+
diff --git a/openoffice.org.spec b/openoffice.org.spec
index 50ded44..482ed9f 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -168,6 +168,7 @@ Patch84: 0001-Resolves-rhbz-674330-dereference-of-NULL-mpBase.patch
 Patch85: 0001-Resolves-rhbz-681159-bandaid-for-crash.patch
 Patch86: 0001-Resolves-rhbz-672818-bandaid-for-crash-in-SwTxtNode-.patch
 Patch87: 0001-Related-rhbz-684477-make-sure-this-is-thread-safe.patch
+Patch88: 0001-Resolves-rhbz-684620-crash-with-NULL-pTableBox.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1752,6 +1753,7 @@ cp -p %{SOURCE5} external/unowinreg/unowinreg.dll
 %patch85 -p0 -b .rhbz681159-bandaid-for-crash.patch
 %patch86 -p0 -b .rhbz672818-bandaid-for-crash-in-SwTxtNode-.patch
 %patch87 -p1 -b .rhbz684477-make-sure-this-is-thread-safe.patch
+%patch88 -p1 -b .rhbz684620-crash-with-NULL-pTableBox.patch
 touch scripting/source/pyprov/delzip
 touch scripting/util/provider/beanshell/delzip
 touch scripting/util/provider/javascript/delzip
@@ -3960,6 +3962,7 @@ unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip > /dev/
 - Resolves: rhbz#681159 crash in writer
 - Resolves: rhbz#672818 crash in writer
 - Related: rhbz#684477 make sure this is thread safe
+- Resolves: rhbz#684620 crash with NULL pTableBox
 
 * Mon Jan 24 2011 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-20.2
 - Resolves: rhbz#671540 fix lonely )