Fix issue with resolveNodes() not found off global proxy object.
We used to assume that a global proxy object could be distinguished
by it not having two internal fields, but that invariant isn't
correct. Instead, flag it as such so the block of code at line 126
will check the prototype to find an actual object.
Squeeze some bytes out of the tags while were at it, no reason for
them to be wide. Also remove GetGlobalObjectFromContext() helper, for
transparency into what's really going on in v8. This then shows a
needless retrieval of an object we already have in one case.
Bug: pdfium:1097
Change-Id: Iafc356373166fe5fda76ea7d64193826ee69a6c3
Reviewed-on: https://pdfium-review.googlesource.com/34630
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
diff --git a/fxjs/README b/fxjs/README
index 6590b58..a1cfe32 100644
--- a/fxjs/README
+++ b/fxjs/README
@@ -20,7 +20,8 @@
objects, regardless of the FXJS/FXJSE distinction. Slot 0 is the
tag and contains either:
kPerObjectDataTag for FXJS objects, or
- g_FXJSETagString for FXJSE Host objects, or
+ g_FXJSEHostObjectTag for FXJSE Host objects, or
+ g_FXJSEProxyObjectTag for a global proxy object under FXJSE, or
One of 4 specific FXJSE_CLASS_DESCRIPTOR globals for FXJSE classes:
GlobalClassDescriptor
NormalClassDescriptor
@@ -29,9 +30,10 @@
Slot 1's contents are determined by these tags:
kPerObjectDataTag means an aligned pointer to CFXJS_PerObjectData.
- g_FXJSETagString means an aligned pointer to CFXJSE_HostObject.
+ g_FXJSEHostObjectTag means an aligned pointer to CFXJSE_HostObject.
+ g_FXJSEProxyObjectTag means nullptr, and to check the prototype instead.
A FXJSE_CLASS_DESCRIPTOR pointer means to expect an actual v8 function
- object, and not an aligned pointer.
+ object (or a string naming that function), and not an aligned pointer.
Because PDFium uses V8 for various unrelated purposes, there may be up to
four v8::Contexts (JS Global Objects) associated with each document. One is
diff --git a/fxjs/cfxjse_context.cpp b/fxjs/cfxjse_context.cpp
index e9297e5..7ee5610 100644
--- a/fxjs/cfxjse_context.cpp
+++ b/fxjs/cfxjse_context.cpp
@@ -42,7 +42,9 @@
" }\n"
"}(this, {String: ['substr', 'toUpperCase']}));";
-wchar_t g_FXJSETagString[] = L"FXJSE_HostObject";
+// Only address matters, values are for humans debuging here.
+char g_FXJSEHostObjectTag[] = "FXJSE Host Object";
+char g_FXJSEProxyObjectTag[] = "FXJSE Proxy Object";
v8::Local<v8::Object> CreateReturnValue(v8::Isolate* pIsolate,
v8::TryCatch& trycatch) {
@@ -85,11 +87,6 @@
return hReturnValue;
}
-v8::Local<v8::Object> GetGlobalObjectFromContext(
- v8::Local<v8::Context> hContext) {
- return hContext->Global()->GetPrototype().As<v8::Object>();
-}
-
class CFXJSE_ScopeUtil_IsolateHandleContext {
public:
explicit CFXJSE_ScopeUtil_IsolateHandleContext(CFXJSE_Context* pContext)
@@ -106,13 +103,20 @@
v8::Context::Scope m_cscope;
};
+void FXJSE_UpdateProxyBinding(v8::Local<v8::Object>& hObject) {
+ ASSERT(!hObject.IsEmpty());
+ ASSERT(hObject->InternalFieldCount() == 2);
+ hObject->SetAlignedPointerInInternalField(0, g_FXJSEProxyObjectTag);
+ hObject->SetAlignedPointerInInternalField(1, nullptr);
+}
+
} // namespace
void FXJSE_UpdateObjectBinding(v8::Local<v8::Object>& hObject,
CFXJSE_HostObject* lpNewBinding) {
ASSERT(!hObject.IsEmpty());
ASSERT(hObject->InternalFieldCount() == 2);
- hObject->SetAlignedPointerInInternalField(0, g_FXJSETagString);
+ hObject->SetAlignedPointerInInternalField(0, g_FXJSEHostObjectTag);
hObject->SetAlignedPointerInInternalField(1, lpNewBinding);
}
@@ -123,7 +127,8 @@
return nullptr;
v8::Local<v8::Object> hObject = hJSObject;
- if (hObject->InternalFieldCount() != 2) {
+ if (hObject->InternalFieldCount() != 2 ||
+ hObject->GetAlignedPointerFromInternalField(0) == g_FXJSEProxyObjectTag) {
v8::Local<v8::Value> hProtoObject = hObject->GetPrototype();
if (hProtoObject.IsEmpty() || !hProtoObject->IsObject())
return nullptr;
@@ -132,8 +137,9 @@
if (hObject->InternalFieldCount() != 2)
return nullptr;
}
- if (hObject->GetAlignedPointerFromInternalField(0) != g_FXJSETagString)
+ if (hObject->GetAlignedPointerFromInternalField(0) != g_FXJSEHostObjectTag)
return nullptr;
+
if (lpClass) {
v8::Local<v8::FunctionTemplate> hClass =
v8::Local<v8::FunctionTemplate>::New(
@@ -175,21 +181,14 @@
v8::Context::New(pIsolate, nullptr, hObjectTemplate);
v8::Local<v8::Object> pThisProxy = hNewContext->Global();
- ASSERT(pThisProxy->InternalFieldCount() == 2);
- pThisProxy->SetAlignedPointerInInternalField(0, nullptr);
- pThisProxy->SetAlignedPointerInInternalField(1, nullptr);
+ FXJSE_UpdateProxyBinding(pThisProxy);
v8::Local<v8::Object> pThis = pThisProxy->GetPrototype().As<v8::Object>();
- ASSERT(pThis->InternalFieldCount() == 2);
- pThis->SetAlignedPointerInInternalField(0, nullptr);
- pThis->SetAlignedPointerInInternalField(1, nullptr);
+ FXJSE_UpdateObjectBinding(pThis, pGlobalObject);
v8::Local<v8::Context> hRootContext = v8::Local<v8::Context>::New(
pIsolate, CFXJSE_RuntimeData::Get(pIsolate)->m_hRootContext);
hNewContext->SetSecurityToken(hRootContext->GetSecurityToken());
-
- v8::Local<v8::Object> hGlobalObject = GetGlobalObjectFromContext(hNewContext);
- FXJSE_UpdateObjectBinding(hGlobalObject, pGlobalObject);
pContext->m_hContext.Reset(pIsolate, hNewContext);
return pContext;
}
@@ -203,7 +202,8 @@
CFXJSE_ScopeUtil_IsolateHandleContext scope(this);
v8::Local<v8::Context> hContext =
v8::Local<v8::Context>::New(m_pIsolate, m_hContext);
- v8::Local<v8::Object> hGlobalObject = GetGlobalObjectFromContext(hContext);
+ v8::Local<v8::Object> hGlobalObject =
+ hContext->Global()->GetPrototype().As<v8::Object>();
pValue->ForceSetValue(hGlobalObject);
return pValue;
}
