Merged PR 153748: Fix the order of setting "initialized" flag in CustomExternalWrapperObject

VSadov · VSadov · commit 36ae40fb22bf · 2018-11-30T19:31:43.000Z
Fix the order of setting "initialized" flag in CustomExternalWrapperObject
diff --git a/lib/Runtime/Library/CustomExternalWrapperObject.cpp b/lib/Runtime/Library/CustomExternalWrapperObject.cpp
@@ -136,7 +136,6 @@ BOOL CustomExternalWrapperObject::EnsureInitialized(ScriptContext* requestContex
     {
         return TRUE;
     }
-    this->initialized = true;
     void* initializeTrap = this->GetExternalType()->GetJsGetterSetterInterceptor()->initializeTrap;
     if (initializeTrap == nullptr)
     {
@@ -147,6 +146,8 @@ BOOL CustomExternalWrapperObject::EnsureInitialized(ScriptContext* requestContex
         threadContext->AddImplicitCallFlags(Js::ImplicitCall_External);
         return FALSE;
     }
+
+    this->initialized = true;
     JavascriptFunction * initializeMethod = Js::VarTo<JavascriptFunction>(initializeTrap);
 
     Js::RecyclableObject * targetObj = this;

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,6 @@ BOOL CustomExternalWrapperObject::EnsureInitialized(ScriptContext* requestContex`
`136`	`136`	`{`
`137`	`137`	`return TRUE;`
`138`	`138`	`}`
`139`		`- this->initialized = true;`
`140`	`139`	`void* initializeTrap = this->GetExternalType()->GetJsGetterSetterInterceptor()->initializeTrap;`
`141`	`140`	`if (initializeTrap == nullptr)`
`142`	`141`	`{`
`@@ -147,6 +146,8 @@ BOOL CustomExternalWrapperObject::EnsureInitialized(ScriptContext* requestContex`
`147`	`146`	`threadContext->AddImplicitCallFlags(Js::ImplicitCall_External);`
`148`	`147`	`return FALSE;`
`149`	`148`	`}`
	`149`	`+`
	`150`	`+ this->initialized = true;`
`150`	`151`	`JavascriptFunction * initializeMethod = Js::VarTo<JavascriptFunction>(initializeTrap);`
`151`	`152`
`152`	`153`	`Js::RecyclableObject * targetObj = this;`