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

[Caolán McNamara]

 sd/source/ui/dlg/sdtreelb.cxx       |    2 ++
 svtools/source/control/valueset.cxx |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 22c83fc1f7a2d2e6fd5ec1262b14e32a28fb2eae
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Oct 19 15:33:43 2015 +0100

    afl-eventtesting: pCursor is null
    
    Change-Id: I24d29ffc3cfcb00e513a5267619e143b028355ce
    (cherry picked from commit 6c39f7bba64fd55488f840675fa83c3ba241bc74)
    Reviewed-on: https://gerrit.libreoffice.org/19468
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 59b9d0f..ee0e892 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -1083,6 +1083,8 @@ void SdPageObjsTLB::KeyInput( const KeyEvent& rKEvt )
     {
         // commented code from svtools/source/contnr/svimpbox.cxx
         SvTreeListEntry* pCursor = GetCurEntry();
+        if (!pCursor)
+            return;
         if( pCursor->HasChildren() || pCursor->HasChildrenOnDemand() )
         {
             if( IsExpanded( pCursor ) )
commit ffa53e3ce8c985c668919eb67a1f7b5acb40aa78
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Oct 19 15:11:59 2015 +0100

    afl-eventtesting: div by zero
    
    Change-Id: If070da723858b5e1221bda86e69225ee57ec9d02
    (cherry picked from commit cfcf0254afe0ce9f4fd80606527bd1f14777f7e1)
    Reviewed-on: https://gerrit.libreoffice.org/19467
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx
index 1067996..4af4a38 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -1327,7 +1327,7 @@ void ValueSet::KeyInput( const KeyEvent& rKeyEvent )
             {
                 if (nCurPos == nLastItem)
                 {
-                    const size_t nCol = nLastItem % mnCols;
+                    const size_t nCol = mnCols ? nLastItem % mnCols : 0;
                     if (nCol < mnCurCol)
                     {
                         // Move to previous row/page, keeping the old column