sc/source/core/data/queryevaluator.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
New commits: commit 4e2f3912440e555f62ea9f5b8182fd6c07560001 Author: Luboš Luňák <l.lu...@collabora.com> AuthorDate: Thu Jun 23 16:39:39 2022 +0200 Commit: Adolfo Jayme Barrientos <fit...@ubuntu.com> CommitDate: Sun Jun 26 02:20:32 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 ba59bd11521373f800c6b718e7e21439c1452e84) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136376 Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.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)