[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - editeng/source

[Caolán McNamara (via logerrit)]

 editeng/source/editeng/impedit.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 1325505f943e2a690a620e96c20d7eeb2dac4945
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Jun 12 10:07:03 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Jun 13 11:32:28 2019 +0200

    Resolves: tdf#125866 null-deref
    
    Change-Id: I0bd597498d10130928de5d7865219fe6f4bc8bcd
    Reviewed-on: https://gerrit.libreoffice.org/73882
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index 551a83b4def2..0fa84e2d90a2 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -1142,6 +1142,9 @@ Pair ImpEditView::Scroll( long ndX, long ndY, ScrollRangeCheck nRangeCheck )
     if ( !ndX && !ndY )
         return Pair( 0, 0 );
 
+    if (!pOutWin)
+        return Pair( 0, 0 );
+
 #ifdef DBG_UTIL
     tools::Rectangle aR( aOutArea );
     aR = pOutWin->LogicToPixel( aR );