[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/source

[Fridrich Å trba]

 sw/source/core/unocore/unotext.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 7bd7e75d6914573289656ea544f8928097614b14
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Thu Apr 25 12:17:17 2013 +0200

    Belts and braces for crash in null pointer dereference
    
    Change-Id: I17fa205f16929b913084c8eee320a73416b1eda0
    (cherry picked from commit d34a159010fc24e13613058d25a9d6b56f7855bd)
    Reviewed-on: https://gerrit.libreoffice.org/3605
    Reviewed-by: Michael Meeks <michael.meeks at suse.com>
    Tested-by: Michael Meeks <michael.meeks at suse.com>

diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index 004e7af..77b44f4 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -1626,7 +1626,8 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
             SwTableNode * pStartTableNode(pStartStartNode->FindTableNode());
             // Is it the same table start node than the end?
             SwTableNode *const pEndStartTableNode(pEndStartNode->FindTableNode());
-            while (pEndStartTableNode->GetIndex() < pStartTableNode->GetIndex())
+            while (pEndStartTableNode && pStartTableNode &&
+                   pEndStartTableNode->GetIndex() < pStartTableNode->GetIndex())
             {
                 SwStartNode* pStartStartTableNode = pStartTableNode->StartOfSectionNode();
                 pStartTableNode = pStartStartTableNode->FindTableNode();