[Libreoffice-commits] core.git: sw/source

Michael Weghorn (via logerrit) logerrit at kemper.freedesktop.org
Fri Oct 11 20:24:21 UTC 2019


 sw/source/core/doc/docdesc.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d4cc6a81400ab2343bcdacc22367cc9a87f6c0c0
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Fri Oct 11 11:11:51 2019 +0200
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Fri Oct 11 22:22:53 2019 +0200

    SwDoc::ChgPageDesc: OSL_ENSURE -> assert
    
    'i' is used as index and the retrieved pointer
    dereferenced.
    
    Change-Id: I07226f13b90754c182d11e6fe778fa353ac7ada8
    Reviewed-on: https://gerrit.libreoffice.org/80651
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>

diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index c7a59f30e955..78d864bf0195 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -385,7 +385,7 @@ void SwDoc::CopyMasterFooter(const SwPageDesc &rChged, const SwFormatFooter &rFo
 
 void SwDoc::ChgPageDesc( size_t i, const SwPageDesc &rChged )
 {
-    OSL_ENSURE(i < m_PageDescs.size(), "PageDescs is out of range.");
+    assert(i < m_PageDescs.size() && "PageDescs is out of range.");
 
     SwPageDesc& rDesc = *m_PageDescs[i];
     SwRootFrame* pTmpRoot = getIDocumentLayoutAccess().GetCurrentLayout();


More information about the Libreoffice-commits mailing list