diff options
Diffstat (limited to 'fpdfsdk')
| -rw-r--r-- | fpdfsdk/fpdfppo.cpp | 21 | ||||
| -rw-r--r-- | fpdfsdk/javascript/Document.cpp | 2 | ||||
| -rw-r--r-- | fpdfsdk/javascript/PublicMethods.cpp | 8 |
3 files changed, 17 insertions, 14 deletions
diff --git a/fpdfsdk/fpdfppo.cpp b/fpdfsdk/fpdfppo.cpp index 861b15c259..d08de020bb 100644 --- a/fpdfsdk/fpdfppo.cpp +++ b/fpdfsdk/fpdfppo.cpp @@ -77,9 +77,9 @@ bool ParserPageRangeString(CFX_ByteString rangstring, return true; rangstring.Remove(' '); - int nLength = rangstring.GetLength(); + FX_STRSIZE nLength = rangstring.GetLength(); CFX_ByteString cbCompareString("0123456789-,"); - for (int i = 0; i < nLength; ++i) { + for (FX_STRSIZE i = 0; i < nLength; ++i) { if (!cbCompareString.Contains(rangstring[i])) return false; } @@ -94,26 +94,29 @@ bool ParserPageRangeString(CFX_ByteString rangstring, cbMidRange = rangstring.Mid(nStringFrom, nStringTo.value() - nStringFrom); auto nMid = cbMidRange.Find('-'); if (!nMid.has_value()) { - long lPageNum = atol(cbMidRange.c_str()); - if (lPageNum <= 0 || lPageNum > nCount) + uint16_t pageNum = + pdfium::base::checked_cast<uint16_t>(atoi(cbMidRange.c_str())); + if (pageNum <= 0 || pageNum > nCount) return false; - pageArray->push_back((uint16_t)lPageNum); + pageArray->push_back(pageNum); } else { - int nStartPageNum = atol(cbMidRange.Left(nMid.value()).c_str()); + uint16_t nStartPageNum = pdfium::base::checked_cast<uint16_t>( + atoi(cbMidRange.Left(nMid.value()).c_str())); if (nStartPageNum == 0) return false; nMid = nMid.value() + 1; - int nEnd = cbMidRange.GetLength() - nMid.value(); + FX_STRSIZE nEnd = cbMidRange.GetLength() - nMid.value(); if (nEnd == 0) return false; - int nEndPageNum = atol(cbMidRange.Mid(nMid.value(), nEnd).c_str()); + uint16_t nEndPageNum = pdfium::base::checked_cast<uint16_t>( + atoi(cbMidRange.Mid(nMid.value(), nEnd).c_str())); if (nStartPageNum < 0 || nStartPageNum > nEndPageNum || nEndPageNum > nCount) { return false; } - for (int i = nStartPageNum; i <= nEndPageNum; ++i) { + for (uint16_t i = nStartPageNum; i <= nEndPageNum; ++i) { pageArray->push_back(i); } } diff --git a/fpdfsdk/javascript/Document.cpp b/fpdfsdk/javascript/Document.cpp index 9b821471c2..d8934a44f6 100644 --- a/fpdfsdk/javascript/Document.cpp +++ b/fpdfsdk/javascript/Document.cpp @@ -1016,7 +1016,7 @@ bool Document::documentFileName(CJS_Runtime* pRuntime, return false; } CFX_WideString wsFilePath = m_pFormFillEnv->JS_docGetFilePath(); - int32_t i = wsFilePath.GetLength() - 1; + FX_STRSIZE i = wsFilePath.GetLength() - 1; for (; i >= 0; i--) { if (wsFilePath[i] == L'\\' || wsFilePath[i] == L'/') break; diff --git a/fpdfsdk/javascript/PublicMethods.cpp b/fpdfsdk/javascript/PublicMethods.cpp index ff1d4fb7b7..ee5bbbacb8 100644 --- a/fpdfsdk/javascript/PublicMethods.cpp +++ b/fpdfsdk/javascript/PublicMethods.cpp @@ -366,7 +366,7 @@ double CJS_PublicMethods::MakeRegularDate(const CFX_WideString& value, bool bExit = false; bool bBadFormat = false; - int i = 0; + FX_STRSIZE i = 0; int j = 0; while (i < format.GetLength()) { @@ -394,7 +394,7 @@ double CJS_PublicMethods::MakeRegularDate(const CFX_WideString& value, case 't': { int oldj = j; int nSkip = 0; - int remaining = format.GetLength() - i - 1; + FX_STRSIZE remaining = format.GetLength() - i - 1; if (remaining == 0 || format[i + 1] != c) { switch (c) { @@ -628,10 +628,10 @@ CFX_WideString CJS_PublicMethods::MakeFormatDate(double dDate, int nMin = JS_GetMinFromTime(dDate); int nSec = JS_GetSecFromTime(dDate); - int i = 0; + FX_STRSIZE i = 0; while (i < format.GetLength()) { wchar_t c = format[i]; - int remaining = format.GetLength() - i - 1; + FX_STRSIZE remaining = format.GetLength() - i - 1; sPart = L""; switch (c) { case 'y': |