accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx | 6 +++--- sw/source/core/layout/flowfrm.cxx | 1 + 2 files changed, 4 insertions(+), 3 deletions(-)
New commits: commit e468a063ceafc3941c9570bf67a5dcdaec84254e Author: Caolán McNamara <caol...@redhat.com> AuthorDate: Mon Jul 22 12:05:37 2019 +0100 Commit: Caolán McNamara <caol...@redhat.com> CommitDate: Tue Jul 23 09:33:28 2019 +0200 cid#1448398 Dereference before null check Change-Id: I55bddd8f152f34919e9818048aaf2a77a94ccaf0 Reviewed-on: https://gerrit.libreoffice.org/76130 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx index d622f38f0ab7..193463df6648 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx @@ -119,13 +119,13 @@ namespace accessibility SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); - if ( !implIsValidIndex( nIndex, implGetText().getLength() ) ) - throw IndexOutOfBoundsException(); - css::awt::Rectangle aRect; if ( mpBrowseBox ) { + if ( !implIsValidIndex( nIndex, implGetText().getLength() ) ) + throw IndexOutOfBoundsException(); + aRect = AWTRectangle( mpBrowseBox->GetFieldCharacterBounds( getRowPos(), getColumnPos(), nIndex ) ); } commit 6e207aeb485e2c9580741b0ecf5da73ed79b6d90 Author: Caolán McNamara <caol...@redhat.com> AuthorDate: Mon Jul 22 12:07:33 2019 +0100 Commit: Caolán McNamara <caol...@redhat.com> CommitDate: Tue Jul 23 09:33:13 2019 +0200 cid#1448404 Dereference null return value Change-Id: I8701430be9282e2120678dc7b55f82c4efeef1ae Reviewed-on: https://gerrit.libreoffice.org/76131 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx index 6e1b40986f73..20ba1d50420d 100644 --- a/sw/source/core/layout/flowfrm.cxx +++ b/sw/source/core/layout/flowfrm.cxx @@ -146,6 +146,7 @@ void SwFlowFrame::CheckKeep() // Kick off the "last" predecessor with a 'keep' attribute, because // it's possible for the whole troop to move back. SwFrame *pPre = m_rThis.GetIndPrev(); + assert(pPre); if( pPre->IsSctFrame() ) { SwFrame *pLast = static_cast<SwSectionFrame*>(pPre)->FindLastContent(); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits