[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - sc/source

[Luboš Luňák (via logerrit)]

 sc/source/core/data/queryevaluator.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 1e169f781248c14110488eb064571068ad3d0f81
Author:     Luboš Luňák <l.lu...@collabora.com>
AuthorDate: Thu Jun 23 16:39:39 2022 +0200
Commit:     Luboš Luňák <l.lu...@collabora.com>
CommitDate: Fri Jun 24 10:50:48 2022 +0200

    handle nullptr SharedString in ScQueryEvaluator (tdf#149679)
    
    This may be the case if the string comes from ScMatrix::Get()
    for ScMatValType::Empty.
    
    Change-Id: I35013449611bf7ffd1bc74e023d76597af010724
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136347
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lu...@collabora.com>
    (cherry picked from commit 9e170a35eebbe86e6137510bc8ea34e5a45dbd8d)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136332
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>

diff --git a/sc/source/core/data/queryevaluator.cxx 
b/sc/source/core/data/queryevaluator.cxx
index 1e16398a4cfb..12e034da6fa0 100644
--- a/sc/source/core/data/queryevaluator.cxx
+++ b/sc/source/core/data/queryevaluator.cxx
@@ -481,8 +481,9 @@ std::pair<bool, bool> 
ScQueryEvaluator::compareByString(const ScQueryEntry& rEnt
                     const rtl_uString* pQuer = 
rItem.maString.getDataIgnoreCase();
                     const rtl_uString* pCellStr = rSource.getDataIgnoreCase();
 
-                    assert(pQuer != nullptr);
                     assert(pCellStr != nullptr);
+                    if (pQuer == nullptr)
+                        pQuer = 
svl::SharedString::getEmptyString().getDataIgnoreCase();
 
                     const sal_Int32 nIndex
                         = (rEntry.eOp == SC_ENDS_WITH || rEntry.eOp == 
SC_DOES_NOT_END_WITH)