summaryrefslogtreecommitdiff
path: root/fpdfsdk/src
diff options
context:
space:
mode:
authorBruce Dawson <brucedawson@google.com>2015-01-05 11:53:18 -0800
committerBruce Dawson <brucedawson@google.com>2015-01-05 11:53:18 -0800
commit5c57933509aedb46399d320da16dfcc3e5acf28d (patch)
treea0d17a5a437669e27e239e743601208e4f09be33 /fpdfsdk/src
parentbbd41bbd5e4ae9ca4f4a800c955471e41a947d98 (diff)
downloadpdfium-5c57933509aedb46399d320da16dfcc3e5acf28d.tar.xz
XFA: merge patch from CL 729293003, use FX_ArraySize for safety
Note that the merge of this fix to XFA found six bugs. Five were fixed in https://codereview.chromium.org/826573003 and one was fixed in https://codereview.chromium.org/831293002. These bugs are now impossible to compile. Replace manual/error-prone/hard-to-verify arraysize calculations with safe FX_ArraySize macro. pdfium has numerous places where the number of elements in an array is calculated with expressions like: sizeof(cFormats)/sizeof(FX_LPCWSTR) This is suboptimal because it is verbose, it is easy to get wrong, and it cannot be determined through casual inspection whether the code is correct. It will give incorrect results if cFormats is a pointer instead of an array and it will give incorrect results if FX_LPCWSTR is not the type of the array elements. The FX_WSTRC macro in fx_string.h which I fixed was particularly scary because it would silently misbehave if passed a pointer. The FX_ArraySize macro which I have added and started using (taken from arraysize in v8's macros.h) is easier to use and will always give correct results. If passed a pointer it will fail to compile. For this change I only fixed instances of sizeof(FX_LPCWSTR). There appear to be about 150 other places in the pdfium code that could benefit from using FX_ArraySize. TBR=bo_xu@foxitsoftware.com, tsepez@chromium.org Review URL: https://codereview.chromium.org/818193004
Diffstat (limited to 'fpdfsdk/src')
-rw-r--r--fpdfsdk/src/javascript/PublicMethods.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/fpdfsdk/src/javascript/PublicMethods.cpp b/fpdfsdk/src/javascript/PublicMethods.cpp
index 7d652496af..3eb8a09ee7 100644
--- a/fpdfsdk/src/javascript/PublicMethods.cpp
+++ b/fpdfsdk/src/javascript/PublicMethods.cpp
@@ -1679,11 +1679,11 @@ FX_BOOL CJS_PublicMethods::AFDate_Format(OBJ_METHOD_PARAMS)
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]);
@@ -1710,11 +1710,11 @@ FX_BOOL CJS_PublicMethods::AFDate_Keystroke(OBJ_METHOD_PARAMS)
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]);
@@ -1738,11 +1738,11 @@ FX_BOOL CJS_PublicMethods::AFTime_Format(OBJ_METHOD_PARAMS)
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]);
@@ -1764,11 +1764,11 @@ FX_BOOL CJS_PublicMethods::AFTime_Keystroke(OBJ_METHOD_PARAMS)
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]);