Merge to XFA: Fix more sign comparison errors.

fpdfsdk/src/javascript/PublicMethods.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "../../include/javascript/JavaScript.h"
 #include "../../include/javascript/IJavaScript.h"
 #include "../../include/javascript/JS_Define.h"
 #include "../../include/javascript/JS_Object.h"
@@ skipping 1480 matching lines @@
                                 L"d-mmm-yy",
                                 L"dd-mmm-yy",
                                 L"yy-mm-dd",
                                 L"mmm-yy",
                                 L"mmmm-yy",
                                 L"mmm d, yyyy",
                                 L"mmmm d, yyyy",
                                 L"m/d/yy h:MM tt",
                                 L"m/d/yy HH:MM"};
 
-  ASSERT(iIndex < FX_ArraySize(cFormats));
+  if (iIndex < 0 || (static_cast<size_t>(iIndex) >= FX_ArraySize(cFormats)))
+    iIndex = 0;
 
-  if (iIndex < 0)
-    iIndex = 0;
-  if (iIndex >= FX_ArraySize(cFormats))
-    iIndex = 0;
   CJS_Parameters newParams;
   CJS_Value val(isolate, cFormats[iIndex]);
   newParams.push_back(val);
   return AFDate_FormatEx(cc, newParams, vRet, sError);
 }
 
 // AFDate_KeystrokeEx(cFormat)
 FX_BOOL CJS_PublicMethods::AFDate_Keystroke(IFXJS_Context* cc,
                                             const CJS_Parameters& params,
                                             CJS_Value& vRet,
@@ skipping 17 matching lines @@
                                 L"d-mmm-yy",
                                 L"dd-mmm-yy",
                                 L"yy-mm-dd",
                                 L"mmm-yy",
                                 L"mmmm-yy",
                                 L"mmm d, yyyy",
                                 L"mmmm d, yyyy",
                                 L"m/d/yy h:MM tt",
                                 L"m/d/yy HH:MM"};
 
-  ASSERT(iIndex < FX_ArraySize(cFormats));
+  if (iIndex < 0 || (static_cast<size_t>(iIndex) >= FX_ArraySize(cFormats)))
+    iIndex = 0;
 
-  if (iIndex < 0)
-    iIndex = 0;
-  if (iIndex >= FX_ArraySize(cFormats))
-    iIndex = 0;
   CJS_Parameters newParams;
   CJS_Value val(isolate, cFormats[iIndex]);
   newParams.push_back(val);
   return AFDate_KeystrokeEx(cc, newParams, vRet, sError);
 }
 
 // function AFTime_Format(ptf)
 FX_BOOL CJS_PublicMethods::AFTime_Format(IFXJS_Context* cc,
                                          const CJS_Parameters& params,
                                          CJS_Value& vRet,
                                          CFX_WideString& sError) {
   v8::Isolate* isolate = ::GetIsolate(cc);
 
   if (params.size() != 1) {
     CJS_Context* pContext = (CJS_Context*)cc;
     ASSERT(pContext != NULL);
     sError = JSGetStringFromID(pContext, IDS_STRING_JSPARAMERROR);
     return FALSE;
   }
 
   int iIndex = params[0].ToInt();
   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 || (static_cast<size_t>(iIndex) >= FX_ArraySize(cFormats)))
+    iIndex = 0;
 
-  if (iIndex < 0)
-    iIndex = 0;
-  if (iIndex >= FX_ArraySize(cFormats))
-    iIndex = 0;
   CJS_Parameters newParams;
   CJS_Value val(isolate, cFormats[iIndex]);
   newParams.push_back(val);
   return AFDate_FormatEx(cc, newParams, vRet, sError);
 }
 
 FX_BOOL CJS_PublicMethods::AFTime_Keystroke(IFXJS_Context* cc,
                                             const CJS_Parameters& params,
                                             CJS_Value& vRet,
                                             CFX_WideString& sError) {
   v8::Isolate* isolate = ::GetIsolate(cc);
   if (params.size() != 1) {
     CJS_Context* pContext = (CJS_Context*)cc;
     ASSERT(pContext != NULL);
     sError = JSGetStringFromID(pContext, IDS_STRING_JSPARAMERROR);
     return FALSE;
   }
 
   int iIndex = params[0].ToInt();
   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 || (static_cast<size_t>(iIndex) >= FX_ArraySize(cFormats)))
+    iIndex = 0;
 
-  if (iIndex < 0)
-    iIndex = 0;
-  if (iIndex >= FX_ArraySize(cFormats))
-    iIndex = 0;
   CJS_Parameters newParams;
   CJS_Value val(isolate, cFormats[iIndex]);
   newParams.push_back(val);
   return AFDate_KeystrokeEx(cc, newParams, vRet, sError);
 }
 
 FX_BOOL CJS_PublicMethods::AFTime_FormatEx(IFXJS_Context* cc,
                                            const CJS_Parameters& params,
                                            CJS_Value& vRet,
                                            CFX_WideString& sError) {
@@ skipping 75 matching lines @@
   }
 
   if (!pEvent->m_pValue)
     return FALSE;
   CFX_WideString& valEvent = pEvent->Value();
 
   CFX_WideString wstrMask = params[0].ToCFXWideString();
   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());
       pEvent->Rc() = FALSE;
     }
     return TRUE;
   }
 
   CFX_WideString& wideChange = pEvent->Change();
   std::wstring wChange = wideChange.c_str();
   if (wChange.empty())
     return TRUE;
 
   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;
     return TRUE;
   }
 
   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;
       return TRUE;
     }
     wchar_t w_Mask = wstrMask[iIndexMask];
     if (!isReservedMaskChar(w_Mask)) {
       *it = w_Mask;
     }
     wchar_t w_Change = *it;
@@ skipping 372 matching lines @@
     nums.SetElement(nIndex, CJS_Value(isolate, sPart.c_str()));
   }
 
   if (nums.GetLength() > 0)
     vRet = nums;
   else
     vRet.SetNull();
 
   return TRUE;
 }