[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sd/source vcl/qa

[Caolán McNamara]

 sd/source/ui/view/Outliner.cxx                       |    2 +-
 vcl/qa/afl-eventtesting/eventtesting.impress.crash-5 |binary
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f318e585265fe5b863bd9927f5aad415ba060173
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Nov 5 21:15:14 2015 +0000

    afl-eventesting: deref of null mpTextObj
    
    Change-Id: Icdb7d1cc250640f428984b96b0a51ac950013cb2
    (cherry picked from commit 0c39c456f47c14e2b7f86d1bc6857dc0e2ca6cb3)
    Reviewed-on: https://gerrit.libreoffice.org/19814
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index e073118..8d88518 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -1272,7 +1272,7 @@ void Outliner::SetPage (EditMode eEditMode, sal_uInt16 nPageIndex)
 void Outliner::EnterEditMode (bool bGrabFocus)
 {
     OutlinerView* pOutlinerView = mpImpl->GetOutlinerView();
-    if (pOutlinerView != NULL)
+    if (pOutlinerView && mpTextObj)
     {
         pOutlinerView->SetOutputArea( Rectangle( Point(), Size(1, 1)));
         SetPaperSize( mpTextObj->GetLogicRect().GetSize() );
diff --git a/vcl/qa/afl-eventtesting/eventtesting.impress.crash-5 b/vcl/qa/afl-eventtesting/eventtesting.impress.crash-5
new file mode 100644
index 0000000..0221754
Binary files /dev/null and b/vcl/qa/afl-eventtesting/eventtesting.impress.crash-5 differ