[Libreoffice-commits] core.git: 2 commits - sdext/source sw/source

[Michael Stahl]

 sdext/source/presenter/PresenterTextView.cxx |    9 ++++++++-
 sw/source/core/para/paratr.cxx               |    2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 0f2981329c6b2cf409a506ad10f1485a8fc7d686
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri May 26 11:36:31 2017 +0200

    sdext: coverity#1409900 Uncaught exception
    
    Change-Id: I45e277440718b9d173f164eaaa3112f4c474aa3a

diff --git a/sdext/source/presenter/PresenterTextView.cxx b/sdext/source/presenter/PresenterTextView.cxx
index ca48c6f15f4f..39ad5591c4b9 100644
--- a/sdext/source/presenter/PresenterTextView.cxx
+++ b/sdext/source/presenter/PresenterTextView.cxx
@@ -1086,7 +1086,14 @@ PresenterTextCaret::PresenterTextCaret (
 
 PresenterTextCaret::~PresenterTextCaret()
 {
-    HideCaret();
+    try
+    {
+        HideCaret();
+    }
+    catch (uno::Exception const&)
+    {
+        SAL_WARN("sdext.presenter", "unexpected exception in ~PresenterTextCaret");
+    }
 }
 
 void PresenterTextCaret::ShowCaret()
commit 40587c191ecf6ec667f40e9148c197246e3c45a5
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

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 );