summaryrefslogtreecommitdiff
path: root/fpdfsdk/src
diff options
context:
space:
mode:
Diffstat (limited to 'fpdfsdk/src')
-rw-r--r--fpdfsdk/src/fpdftext_embeddertest.cpp8
-rw-r--r--fpdfsdk/src/javascript/PublicMethods.cpp51
2 files changed, 25 insertions, 34 deletions
diff --git a/fpdfsdk/src/fpdftext_embeddertest.cpp b/fpdfsdk/src/fpdftext_embeddertest.cpp
index dd3737a40e..b3fe9e4c1e 100644
--- a/fpdfsdk/src/fpdftext_embeddertest.cpp
+++ b/fpdfsdk/src/fpdftext_embeddertest.cpp
@@ -40,13 +40,17 @@ TEST_F(FPDFTextEmbeddertest, Text) {
memset(fixed_buffer, 0xbd, sizeof(fixed_buffer));
// Check includes the terminating NUL that is provided.
- EXPECT_EQ(sizeof(expected), FPDFText_GetText(textpage, 0, 128, fixed_buffer));
+ int num_chars = FPDFText_GetText(textpage, 0, 128, fixed_buffer);
+ ASSERT_GE(num_chars, 0);
+ EXPECT_EQ(sizeof(expected), static_cast<size_t>(num_chars));
EXPECT_TRUE(check_unsigned_shorts(expected, fixed_buffer, sizeof(expected)));
// Count does not include the terminating NUL in the string literal.
EXPECT_EQ(sizeof(expected) - 1, FPDFText_CountChars(textpage));
for (size_t i = 0; i < sizeof(expected) - 1; ++i) {
- EXPECT_EQ(expected[i], FPDFText_GetUnicode(textpage, i)) << " at " << i;
+ EXPECT_EQ(static_cast<unsigned int>(expected[i]),
+ FPDFText_GetUnicode(textpage, i))
+ << " at " << i;
}
EXPECT_EQ(12.0, FPDFText_GetFontSize(textpage, 0));
diff --git a/fpdfsdk/src/javascript/PublicMethods.cpp b/fpdfsdk/src/javascript/PublicMethods.cpp
index f71ea37c20..38de89d894 100644
--- a/fpdfsdk/src/javascript/PublicMethods.cpp
+++ b/fpdfsdk/src/javascript/PublicMethods.cpp
@@ -1498,12 +1498,9 @@ FX_BOOL CJS_PublicMethods::AFDate_Format(IFXJS_Context* cc,
L"m/d/yy h:MM tt",
L"m/d/yy HH:MM"};
- ASSERT(iIndex < FX_ArraySize(cFormats));
-
- if (iIndex < 0)
- iIndex = 0;
- if (iIndex >= FX_ArraySize(cFormats))
+ if (iIndex < 0 || (static_cast<size_t>(iIndex) >= FX_ArraySize(cFormats)))
iIndex = 0;
+
CJS_Parameters newParams;
CJS_Value val(isolate, cFormats[iIndex]);
newParams.push_back(val);
@@ -1541,12 +1538,9 @@ FX_BOOL CJS_PublicMethods::AFDate_Keystroke(IFXJS_Context* cc,
L"m/d/yy h:MM tt",
L"m/d/yy HH:MM"};
- ASSERT(iIndex < FX_ArraySize(cFormats));
-
- if (iIndex < 0)
- iIndex = 0;
- if (iIndex >= FX_ArraySize(cFormats))
+ if (iIndex < 0 || (static_cast<size_t>(iIndex) >= FX_ArraySize(cFormats)))
iIndex = 0;
+
CJS_Parameters newParams;
CJS_Value val(isolate, cFormats[iIndex]);
newParams.push_back(val);
@@ -1571,12 +1565,9 @@ FX_BOOL CJS_PublicMethods::AFTime_Format(IFXJS_Context* cc,
const FX_WCHAR* cFormats[] = {L"HH:MM", L"h:MM tt", L"HH:MM:ss",
L"h:MM:ss tt"};
- ASSERT(iIndex < FX_ArraySize(cFormats));
-
- if (iIndex < 0)
- iIndex = 0;
- if (iIndex >= FX_ArraySize(cFormats))
+ if (iIndex < 0 || (static_cast<size_t>(iIndex) >= FX_ArraySize(cFormats)))
iIndex = 0;
+
CJS_Parameters newParams;
CJS_Value val(isolate, cFormats[iIndex]);
newParams.push_back(val);
@@ -1599,12 +1590,9 @@ FX_BOOL CJS_PublicMethods::AFTime_Keystroke(IFXJS_Context* cc,
const FX_WCHAR* cFormats[] = {L"HH:MM", L"h:MM tt", L"HH:MM:ss",
L"h:MM:ss tt"};
- ASSERT(iIndex < FX_ArraySize(cFormats));
-
- if (iIndex < 0)
- iIndex = 0;
- if (iIndex >= FX_ArraySize(cFormats))
+ if (iIndex < 0 || (static_cast<size_t>(iIndex) >= FX_ArraySize(cFormats)))
iIndex = 0;
+
CJS_Parameters newParams;
CJS_Value val(isolate, cFormats[iIndex]);
newParams.push_back(val);
@@ -1700,22 +1688,21 @@ FX_BOOL CJS_PublicMethods::AFSpecial_KeystrokeEx(IFXJS_Context* cc,
if (wstrMask.IsEmpty())
return TRUE;
- std::wstring wstrValue = valEvent.c_str();
+ const size_t wstrMaskLen = wstrMask.GetLength();
+ const std::wstring wstrValue = valEvent.c_str();
if (pEvent->WillCommit()) {
if (wstrValue.empty())
return TRUE;
- int iIndexMask = 0;
- for (std::wstring::iterator it = wstrValue.begin(); it != wstrValue.end();
- it++) {
- wchar_t w_Value = *it;
+ size_t iIndexMask = 0;
+ for (const auto& w_Value : wstrValue) {
if (!maskSatisfied(w_Value, wstrMask[iIndexMask]))
break;
iIndexMask++;
}
- if (iIndexMask != wstrMask.GetLength() ||
- (iIndexMask != wstrValue.size() && wstrMask.GetLength() != 0)) {
+ if (iIndexMask != wstrMaskLen ||
+ (iIndexMask != wstrValue.size() && wstrMaskLen != 0)) {
Alert(
pContext,
JSGetStringFromID(pContext, IDS_STRING_JSAFNUMBER_KEYSTROKE).c_str());
@@ -1731,16 +1718,16 @@ FX_BOOL CJS_PublicMethods::AFSpecial_KeystrokeEx(IFXJS_Context* cc,
int iIndexMask = pEvent->SelStart();
- if (wstrValue.length() - (pEvent->SelEnd() - pEvent->SelStart()) +
- wChange.length() >
- (FX_DWORD)wstrMask.GetLength()) {
+ size_t combined_len = wstrValue.length() + wChange.length() -
+ (pEvent->SelEnd() - pEvent->SelStart());
+ if (combined_len > wstrMaskLen) {
Alert(pContext,
JSGetStringFromID(pContext, IDS_STRING_JSPARAM_TOOLONG).c_str());
pEvent->Rc() = FALSE;
return TRUE;
}
- if (iIndexMask >= wstrMask.GetLength() && (!wChange.empty())) {
+ if (iIndexMask >= wstrMaskLen && (!wChange.empty())) {
Alert(pContext,
JSGetStringFromID(pContext, IDS_STRING_JSPARAM_TOOLONG).c_str());
pEvent->Rc() = FALSE;
@@ -1748,7 +1735,7 @@ FX_BOOL CJS_PublicMethods::AFSpecial_KeystrokeEx(IFXJS_Context* cc,
}
for (std::wstring::iterator it = wChange.begin(); it != wChange.end(); it++) {
- if (iIndexMask >= wstrMask.GetLength()) {
+ if (iIndexMask >= wstrMaskLen) {
Alert(pContext,
JSGetStringFromID(pContext, IDS_STRING_JSPARAM_TOOLONG).c_str());
pEvent->Rc() = FALSE;