sc/source/core/tool/chgtrack.cxx | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-)
New commits: commit 81411dc7c6481db6a90f3841df15c977f8c21205 Author: Caolán McNamara <caol...@redhat.com> AuthorDate: Thu Jul 26 11:58:36 2018 +0100 Commit: Caolán McNamara <caol...@redhat.com> CommitDate: Thu Jul 26 22:03:44 2018 +0200 Related: rhbz#1602589 silence coverity use_after_free Change-Id: If5345b6515c45bee2742d1293cd181ab46e8e61b Reviewed-on: https://gerrit.libreoffice.org/58088 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx index 35c1d72dbe64..8b73880e718e 100644 --- a/sc/source/core/tool/chgtrack.cxx +++ b/sc/source/core/tool/chgtrack.cxx @@ -341,8 +341,11 @@ bool ScChangeAction::IsDeletedIn( const ScChangeAction* p ) const void ScChangeAction::RemoveAllDeletedIn() { //TODO: Not from TopContent, but really this one - while ( pLinkDeletedIn ) - delete pLinkDeletedIn; // Moves up by itself + while (pLinkDeletedIn) + { + // coverity[use_after_free] - Moves up by itself + delete pLinkDeletedIn; + } } bool ScChangeAction::IsDeletedInDelType( ScChangeActionType eDelType ) const @@ -401,8 +404,11 @@ void ScChangeAction::SetDeletedIn( ScChangeAction* p ) void ScChangeAction::RemoveAllDependent() { - while ( pLinkDependent ) - delete pLinkDependent; // Moves up by itself + while (pLinkDependent) + { + // coverity[use_after_free] - Moves up by itself + delete pLinkDependent; + } } DateTime ScChangeAction::GetDateTime() const @@ -830,8 +836,11 @@ ScChangeActionDel::ScChangeActionDel( ScChangeActionDel::~ScChangeActionDel() { DeleteCellEntries(); - while ( pLinkMove ) + while (pLinkMove) + { + // coverity[use_after_free] - Moves up by itself delete pLinkMove; + } } void ScChangeActionDel::AddContent( ScChangeActionContent* pContent ) @@ -1056,6 +1065,7 @@ void ScChangeActionDel::UndoCutOffMoves() { // Restore cut off Moves; delete Entries/Links while ( pLinkMove ) { + // coverity[deref_arg] - the call on delete pLinkMove at the block end Moves a new entry into pLinkMode by itself ScChangeActionMove* pMove = pLinkMove->GetMove(); short nFrom = pLinkMove->GetCutOffFrom(); short nTo = pLinkMove->GetCutOffTo(); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits