From 4862705090a7469115ae7e3c80143b6f8b6b527a Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Thu, 5 Apr 2018 22:41:53 +0000 Subject: Make Internal field usage in cfxjs_engine match README.doc As it turns out, this doesn't cause any bugs with the FXJS/FXJSE interaction since the magic values will never be present in the other slot, but the code looks wrong wrt. the document. Also fix an assert in FXJSE that our objects have two slots, and null appropriately (just a defensive measure). Also assert that one of our casts is valid. Change-Id: I3146fe58350da5e9b76e711d81480565dabd587f Reviewed-on: https://pdfium-review.googlesource.com/29859 Reviewed-by: dsinclair Commit-Queue: Tom Sepez --- fxjs/cfxjse_formcalc_context.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'fxjs/cfxjse_formcalc_context.cpp') diff --git a/fxjs/cfxjse_formcalc_context.cpp b/fxjs/cfxjse_formcalc_context.cpp index 4ad3861dfe..85d0ef8d57 100644 --- a/fxjs/cfxjse_formcalc_context.cpp +++ b/fxjs/cfxjse_formcalc_context.cpp @@ -311,16 +311,6 @@ const FXJSE_FUNCTION_DESCRIPTOR kFormCalcFM2JSFunctions[] = { {"var_filter", CFXJSE_FormCalcContext::fm_var_filter}, }; -const FXJSE_CLASS_DESCRIPTOR kFormCalcFM2JSDescriptor = { - "XFA_FM2JS_FormCalcClass", // name - kFormCalcFM2JSFunctions, // methods - FX_ArraySize(kFormCalcFM2JSFunctions), // number of methods - nullptr, // dynamic prop type - nullptr, // dynamic prop getter - nullptr, // dynamic prop setter - nullptr, // dynamic prop method call -}; - const uint8_t kAltTableDate[] = { 255, 255, 255, 3, 9, 255, 255, 255, 255, 255, 255, 255, 2, 255, 255, 255, 255, 255, 255, 255, 255, 255, @@ -615,6 +605,16 @@ double ByteStringToDouble(const ByteStringView& szStringVal) { } // namespace +const FXJSE_CLASS_DESCRIPTOR kFormCalcFM2JSDescriptor = { + "XFA_FM2JS_FormCalcClass", // name + kFormCalcFM2JSFunctions, // methods + FX_ArraySize(kFormCalcFM2JSFunctions), // number of methods + nullptr, // dynamic prop type + nullptr, // dynamic prop getter + nullptr, // dynamic prop setter + nullptr, // dynamic prop method call +}; + // static void CFXJSE_FormCalcContext::Abs(CFXJSE_Value* pThis, const ByteStringView& szFuncName, -- cgit v1.2.3