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

[Michael Stahl]

 sw/source/core/para/paratr.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 32d43cb00105e463cda42b926b829407f536cf1c
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri May 26 11:25:06 2017 +0200

    sw: coverity#1409899 Null pointer dereferences
    
    Change-Id: I152def3c629980aedb705ac511f154cc6e9d1b0f
    (cherry picked from commit 40587c191ecf6ec667f40e9148c197246e3c45a5)
    Reviewed-on: https://gerrit.libreoffice.org/38061
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sw/source/core/para/paratr.cxx b/sw/source/core/para/paratr.cxx
index aa76115b6528..c5eb8ecefb36 100644
--- a/sw/source/core/para/paratr.cxx
+++ b/sw/source/core/para/paratr.cxx
@@ -64,7 +64,7 @@ SwFormatDrop::~SwFormatDrop()
 
 void SwFormatDrop::SetCharFormat( SwCharFormat *pNew )
 {
-    assert(!pNew->IsDefault()); // expose cases that lead to use-after-free
+    assert(!pNew || !pNew->IsDefault()); // expose cases that lead to use-after-free
     // Rewire
     if ( GetRegisteredIn() )
         GetRegisteredInNonConst()->Remove( this );