From 193e6ca5e48ee99e620f0e7546f1407ba1a20323 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 14 Mar 2017 15:53:36 -0700 Subject: Add IndexInBounds() convenience routine. Avoid writing |Type| in CollectionSize() so that index type can change without rewriting conditions. Change-Id: I40c94ca39148b379908760ba9b861114b88af7bb Reviewed-on: https://pdfium-review.googlesource.com/3056 Reviewed-by: Lei Zhang Commit-Queue: Tom Sepez --- xfa/fgas/layout/cfx_breakline.cpp | 4 ++-- xfa/fgas/layout/fgas_rtfbreak.cpp | 3 ++- xfa/fgas/layout/fgas_textbreak.cpp | 7 +++---- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'xfa/fgas') diff --git a/xfa/fgas/layout/cfx_breakline.cpp b/xfa/fgas/layout/cfx_breakline.cpp index 65860e4013..562f984ffe 100644 --- a/xfa/fgas/layout/cfx_breakline.cpp +++ b/xfa/fgas/layout/cfx_breakline.cpp @@ -17,12 +17,12 @@ int32_t CFX_BreakLine::CountChars() const { } CFX_Char* CFX_BreakLine::GetChar(int32_t index) { - ASSERT(index >= 0 && index < pdfium::CollectionSize(m_LineChars)); + ASSERT(pdfium::IndexInBounds(m_LineChars, index)); return &m_LineChars[index]; } const CFX_Char* CFX_BreakLine::GetChar(int32_t index) const { - ASSERT(index >= 0 && index < pdfium::CollectionSize(m_LineChars)); + ASSERT(pdfium::IndexInBounds(m_LineChars, index)); return &m_LineChars[index]; } diff --git a/xfa/fgas/layout/fgas_rtfbreak.cpp b/xfa/fgas/layout/fgas_rtfbreak.cpp index 37822140c3..68c04a7f64 100644 --- a/xfa/fgas/layout/fgas_rtfbreak.cpp +++ b/xfa/fgas/layout/fgas_rtfbreak.cpp @@ -805,8 +805,9 @@ const CFX_BreakPiece* CFX_RTFBreak::GetBreakPieceUnstable(int32_t index) const { const std::vector& pRTFPieces = m_RTFLine[m_iReadyLineIndex].m_LinePieces; - if (index < 0 || index >= pdfium::CollectionSize(pRTFPieces)) + if (!pdfium::IndexInBounds(pRTFPieces, index)) return nullptr; + return &pRTFPieces[index]; } diff --git a/xfa/fgas/layout/fgas_textbreak.cpp b/xfa/fgas/layout/fgas_textbreak.cpp index 8bba780382..c42de45411 100644 --- a/xfa/fgas/layout/fgas_textbreak.cpp +++ b/xfa/fgas/layout/fgas_textbreak.cpp @@ -796,11 +796,10 @@ int32_t CFX_TxtBreak::CountBreakPieces() const { const CFX_BreakPiece* CFX_TxtBreak::GetBreakPiece(int32_t index) const { if (!HasTxtLine()) return nullptr; - if (index < 0 || - index >= pdfium::CollectionSize( - m_TxtLine[m_iReadyLineIndex].m_LinePieces)) { + + if (!pdfium::IndexInBounds(m_TxtLine[m_iReadyLineIndex].m_LinePieces, index)) return nullptr; - } + return &m_TxtLine[m_iReadyLineIndex].m_LinePieces[index]; } -- cgit v1.2.3