XFA: merge patch from CL 729293003, use FX_ArraySize for safety

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 1661 matching lines @@
 
                 sError = JSGetStringFromID(pContext, IDS_STRING_JSPARAMERROR);
                 return FALSE;
         }
 
         int iIndex = params[0];
         FX_LPCWSTR cFormats[] =  {L"m/d", L"m/d/yy", L"mm/dd/yy", L"mm/yy", L"d-mmm", 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 < sizeof(cFormats)/sizeof(FX_LPCWSTR));
+        ASSERT(iIndex < FX_ArraySize(cFormats));
 
         if (iIndex < 0)
                 iIndex = 0;
-        if (iIndex >= sizeof(cFormats)/sizeof(FX_LPCWSTR))
+        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(OBJ_METHOD_PARAMS)
 {
         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];
         FX_LPCWSTR cFormats[] =  {L"m/d", L"m/d/yy", L"mm/dd/yy", L"mm/yy", L"d-mmm", 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<sizeof(cFormats)/sizeof(FX_LPCWSTR));
+        ASSERT(iIndex<FX_ArraySize(cFormats));
 
         if (iIndex < 0)
                 iIndex = 0;
-        if (iIndex >= sizeof(cFormats)/sizeof(FX_LPCWSTR))
+        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(OBJ_METHOD_PARAMS)
 {
         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];
         FX_LPCWSTR cFormats[] = {L"HH:MM", L"h:MM tt", L"HH:MM:ss", L"h:MM:ss tt"};
 
-        ASSERT(iIndex<sizeof(cFormats)/sizeof(FX_LPCWSTR));
+        ASSERT(iIndex<FX_ArraySize(cFormats));
 
         if (iIndex < 0)
                 iIndex = 0;
-        if (iIndex >= sizeof(cFormats)/sizeof(FX_LPCWSTR))
+        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(OBJ_METHOD_PARAMS)
 {
         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];
         FX_LPCWSTR cFormats[] = {L"HH:MM", L"h:MM tt", L"HH:MM:ss", L"h:MM:ss tt"};
 
-        ASSERT(iIndex<sizeof(cFormats)/sizeof(FX_LPCWSTR));
+        ASSERT(iIndex<FX_ArraySize(cFormats));
 
         if (iIndex < 0)
                 iIndex = 0;
-        if (iIndex >= sizeof(cFormats)/sizeof(FX_LPCWSTR))
+        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(OBJ_METHOD_PARAMS)
 {
         return AFDate_FormatEx(cc,params,vRet,sError);
@@ skipping 534 matching lines @@
                 nums.SetElement(nIndex,CJS_Value(isolate,sPart.c_str()));       
         }
 
         if (nums.GetLength() > 0)
                 vRet = nums;
         else
                 vRet.SetNull();
 
         return TRUE;
 }