dbaccess/source/ui/dlg/dbfindex.cxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
New commits: commit 3c0003c9f0ff5bdc49da046a604a3d2c8cc5d5df Author: Julien Nabet <serval2...@yahoo.fr> AuthorDate: Thu May 16 22:01:45 2019 +0200 Commit: Julien Nabet <serval2...@yahoo.fr> CommitDate: Fri May 17 09:21:04 2019 +0200 tdf#125325: fix crash about index managements for dBase See bt here: https://bugs.documentfoundation.org/attachment.cgi?id=151468 Pb is aSearch becomes invalid after _rList.erase(aSearch); line 101 so just test aReturn.GetIndexFileName() isn't empty Change-Id: Iae5b3a7f76fe565f890bd23bfb2ce5d9c6134986 Reviewed-on: https://gerrit.libreoffice.org/72427 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2...@yahoo.fr> diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx index 734af6e961bc..fe934b7914c0 100644 --- a/dbaccess/source/ui/dlg/dbfindex.cxx +++ b/dbaccess/source/ui/dlg/dbfindex.cxx @@ -107,8 +107,7 @@ OTableIndex ODbaseIndexDialog::implRemoveIndex(const OUString& _rName, TableInde else _rDisplay.select(static_cast<sal_uInt16>(nPos)); } - - OSL_ENSURE(!_bMustExist || (aSearch != _rList.end()), "ODbaseIndexDialog::implRemoveIndex : did not find the index!"); + OSL_ENSURE(!_bMustExist || !aReturn.GetIndexFileName().isEmpty(), "ODbaseIndexDialog::implRemoveIndex : did not find the index!"); return aReturn; } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits