[libreoffice] Resolves: rhbz#684620 crash with NULL pTableBox

[Caolan McNamara]

commit 0576177f62c040f22120e29f649b9edd72b095a7
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Mar 14 11:32:01 2011 +0000

    Resolves: rhbz#684620 crash with NULL pTableBox

 ...ves-rhbz-684620-crash-with-NULL-pTableBox.patch |   25 ++++++++++++++++++++
 libreoffice.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/libreoffice.spec b/libreoffice.spec
index 2fc6cab..822763f 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -122,6 +122,7 @@ Patch34: 0001-install-high-resolution-icons.patch
 Patch35: 0001-Resolves-rhbz-682716-pa-IN-isn-t-handled-by-fontconf.patch
 Patch36: 0001-Resolves-rhbz-682621-better-resizing-of-overtall-gly.patch
 Patch37: 0001-Related-rhbz-684477-make-sure-this-is-thread-safe.patch
+Patch38: 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}
@@ -762,6 +763,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch35 -p1 -b .rhbz682716-pa-IN-isn-t-handled-by-fontconf.patch
 %patch36 -p1 -b .rhbz682621-better-resizing-of-overtall-gly.patch
 %patch37 -p1 -b .rhbz684477-make-sure-this-is-thread-safe.patch
+%patch38 -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
@@ -2109,6 +2111,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %changelog
 * Mon Mar 14 2011 Caolán McNamara <caolanm at redhat.com> 3.3.1.2-8
 - Related: rhbz#684477 make sure this is thread safe
+- Resolves: rhbz#684620 crash with NULL pTableBox
 
 * Sun Mar 13 2011 Marek Kasik <mkasik at redhat.com> 3.3.1.2-7
 - Rebuild (poppler-0.16.3)