[Libreoffice-commits] core.git: oox/source

[Libreoffice Gerrit user]

 oox/source/ppt/timenode.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 9fe16109167b57ab7e7356f96fcee9ecfeeb1b63
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Aug 16 15:01:55 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Aug 16 22:18:30 2018 +0200

    ofz#9932 Null-deref
    
    Change-Id: I6a917e118fa9263069c13122765fc6c1ace2bddb
    Reviewed-on: https://gerrit.libreoffice.org/59183
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/oox/source/ppt/timenode.cxx b/oox/source/ppt/timenode.cxx
index 854797a9649c..9b77001aaff1 100644
--- a/oox/source/ppt/timenode.cxx
+++ b/oox/source/ppt/timenode.cxx
@@ -205,6 +205,8 @@ namespace oox { namespace ppt {
             OUString sServiceName = getServiceName(nNodeType);
 
             Reference< XAnimationNode > xNode = createAndInsert( rFilter, sServiceName, rxNode );
+            if (!xNode)
+                return;
             setNode(rFilter, xNode, pSlide, rxNode);
         }
         catch( const Exception& e )
@@ -236,7 +238,7 @@ namespace oox { namespace ppt {
             if( !maStCondList.empty() )
             {
                 Any aAny = AnimationCondition::convertList( pSlide, maStCondList );
-                 if( aAny.hasValue() )
+                if( aAny.hasValue() )
                 {
                     xNode->setBegin( aAny );
                 }