[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - starmath/source

[Julien Nabet]

 starmath/source/mathmlexport.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 352a728ffbe171ea6f9f8e93e143fa24198d8271
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Wed Aug 20 23:02:56 2014 +0200

    Resolves: fdo#82747 Crash on opening wikipedia ODT Book
    
    Test if there's indeed a subnode before testing its type
    
    Cherry-picked from 3d34eb4612fa59fae7594399d3d6f798ddb35582
    
    Change-Id: I1bb32652ceb82b0818a8d2cd8d71b46dd96ef2aa
    Reviewed-on: https://gerrit.libreoffice.org/11050
    Reviewed-by: Thomas Arnhold <thomas at arnhold.org>
    Tested-by: Thomas Arnhold <thomas at arnhold.org>
    Reviewed-on: https://gerrit.libreoffice.org/11084
    Reviewed-by: David Tardon <dtardon at redhat.com>

diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index 7fffe8f..7299d08 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -890,6 +890,7 @@ void SmXMLExport::ExportTable(const SmNode *pNode, int nLevel)
                 }
                 else if (pTemp->GetType() == NLINE &&
                          pTemp->GetNumSubNodes() == 1 &&
+                         pTemp->GetSubNode(0) &&
                          pTemp->GetSubNode(0)->GetType() == NALIGN)
                 {
                     // For the Table() construction, the NALIGN node is a child