1 files changed, 22 insertions, 0 deletions

diff --git a/fxjs/cjs_event.cpp b/fxjs/cjs_event.cpp
index ca0671d3a9..de22ab8488 100644
--- a/fxjs/cjs_event.cpp
+++ b/fxjs/cjs_event.cpp
@@ -50,6 +50,8 @@ CJS_Event::CJS_Event(v8::Local<v8::Object> pObject, CJS_Runtime* pRuntime)
 CJS_Event::~CJS_Event() = default;
 
 CJS_Return CJS_Event::get_change(CJS_Runtime* pRuntime) {
+  ASSERT(pRuntime->GetCurrentEventContext());
+
   CJS_EventHandler* pEvent =
       pRuntime->GetCurrentEventContext()->GetEventHandler();
   return CJS_Return(pRuntime->NewString(pEvent->Change().c_str()));
@@ -57,6 +59,8 @@ CJS_Return CJS_Event::get_change(CJS_Runtime* pRuntime) {
 
 CJS_Return CJS_Event::set_change(CJS_Runtime* pRuntime,
                                  v8::Local<v8::Value> vp) {
+  ASSERT(pRuntime->GetCurrentEventContext());
+
   CJS_EventHandler* pEvent =
       pRuntime->GetCurrentEventContext()->GetEventHandler();
 
@@ -68,6 +72,8 @@ CJS_Return CJS_Event::set_change(CJS_Runtime* pRuntime,
 }
 
 CJS_Return CJS_Event::get_change_ex(CJS_Runtime* pRuntime) {
+  ASSERT(pRuntime->GetCurrentEventContext());
+
   CJS_EventHandler* pEvent =
       pRuntime->GetCurrentEventContext()->GetEventHandler();
 
@@ -80,6 +86,8 @@ CJS_Return CJS_Event::set_change_ex(CJS_Runtime* pRuntime,
 }
 
 CJS_Return CJS_Event::get_commit_key(CJS_Runtime* pRuntime) {
+  ASSERT(pRuntime->GetCurrentEventContext());
+
   CJS_EventHandler* pEvent =
       pRuntime->GetCurrentEventContext()->GetEventHandler();
 
@@ -92,6 +100,8 @@ CJS_Return CJS_Event::set_commit_key(CJS_Runtime* pRuntime,
 }
 
 CJS_Return CJS_Event::get_field_full(CJS_Runtime* pRuntime) {
+  ASSERT(pRuntime->GetCurrentEventContext());
+
   CJS_EventHandler* pEvent =
       pRuntime->GetCurrentEventContext()->GetEventHandler();
 
@@ -245,6 +255,8 @@ CJS_Return CJS_Event::set_source(CJS_Runtime* pRuntime,
 }
 
 CJS_Return CJS_Event::get_target(CJS_Runtime* pRuntime) {
+  ASSERT(pRuntime->GetCurrentEventContext());
+
   CJS_EventHandler* pEvent =
       pRuntime->GetCurrentEventContext()->GetEventHandler();
   return CJS_Return(pEvent->Target_Field()->ToV8Object());
@@ -256,6 +268,8 @@ CJS_Return CJS_Event::set_target(CJS_Runtime* pRuntime,
 }
 
 CJS_Return CJS_Event::get_target_name(CJS_Runtime* pRuntime) {
+  ASSERT(pRuntime->GetCurrentEventContext());
+
   CJS_EventHandler* pEvent =
       pRuntime->GetCurrentEventContext()->GetEventHandler();
   return CJS_Return(pRuntime->NewString(pEvent->TargetName().c_str()));
@@ -267,6 +281,8 @@ CJS_Return CJS_Event::set_target_name(CJS_Runtime* pRuntime,
 }
 
 CJS_Return CJS_Event::get_type(CJS_Runtime* pRuntime) {
+  ASSERT(pRuntime->GetCurrentEventContext());
+
   CJS_EventHandler* pEvent =
       pRuntime->GetCurrentEventContext()->GetEventHandler();
   return CJS_Return(pRuntime->NewString(pEvent->Type()));
@@ -277,6 +293,8 @@ CJS_Return CJS_Event::set_type(CJS_Runtime* pRuntime, v8::Local<v8::Value> vp) {
 }
 
 CJS_Return CJS_Event::get_value(CJS_Runtime* pRuntime) {
+  ASSERT(pRuntime->GetCurrentEventContext());
+
   CJS_EventHandler* pEvent =
       pRuntime->GetCurrentEventContext()->GetEventHandler();
 
@@ -291,6 +309,8 @@ CJS_Return CJS_Event::get_value(CJS_Runtime* pRuntime) {
 
 CJS_Return CJS_Event::set_value(CJS_Runtime* pRuntime,
                                 v8::Local<v8::Value> vp) {
+  ASSERT(pRuntime->GetCurrentEventContext());
+
   CJS_EventHandler* pEvent =
       pRuntime->GetCurrentEventContext()->GetEventHandler();
 
@@ -305,6 +325,8 @@ CJS_Return CJS_Event::set_value(CJS_Runtime* pRuntime,
 }
 
 CJS_Return CJS_Event::get_will_commit(CJS_Runtime* pRuntime) {
+  ASSERT(pRuntime->GetCurrentEventContext());
+
   CJS_EventHandler* pEvent =
       pRuntime->GetCurrentEventContext()->GetEventHandler();
   return CJS_Return(pRuntime->NewBoolean(pEvent->WillCommit()));