[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sc/source

Julien Nabet (via logerrit) logerrit at kemper.freedesktop.org
Tue May 12 17:55:26 UTC 2020


 sc/source/ui/unoobj/cellsuno.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 71c9aea35edcb82cbd27c50ae4fcd01e4a72b81d
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Mon May 11 13:03:24 2020 +0200
Commit:     Eike Rathke <erack at redhat.com>
CommitDate: Tue May 12 19:54:54 2020 +0200

    tdf#132939: avoid crash when uninitialized FilterDescriptor
    
    See bt:
    https://bugs.documentfoundation.org/attachment.cgi?id=160656
    
    Change-Id: Ifacce7d39878e1b1d119aa878e7280eb3c9c2228
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93959
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    (cherry picked from commit 3466488ef22752c8f6f47f7b8f1dac5cc0cb27a2)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93989
    Reviewed-by: Eike Rathke <erack at redhat.com>

diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 0f3bf54e3765..c6b8ef1e01d0 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -5406,6 +5406,8 @@ void SAL_CALL ScCellRangeObj::filter( const uno::Reference<sheet::XSheetFilterDe
 {
     SolarMutexGuard aGuard;
 
+    if (!xDescriptor.is()) return;
+
     //  This could be theoretically an unknown object, so only use the
     //  public XSheetFilterDescriptor interface to copy the data into a
     //  ScFilterDescriptor object:


More information about the Libreoffice-commits mailing list