[[ LCB ]] Make sure you cannot call context handlers except from an LCB frame.

runrevmark · runrevmark · commit 256cf0fff371 · 2015-02-10T15:49:22.000Z
diff --git a/libscript/src/script-instance.cpp b/libscript/src/script-instance.cpp
@@ -286,6 +286,11 @@ bool MCScriptThrowNotAHandlerValueError(MCValueRef p_value)
     return MCErrorCreateAndThrow(kMCScriptNotAHandlerValueErrorTypeInfo, "value", p_value, nil);
 }
 
+bool MCScriptThrowCannotCallContextHandlerError(MCScriptModuleRef p_module, MCScriptDefinition *p_handler)
+{
+    return MCErrorCreateAndThrow(kMCScriptCannotCallContextHandlerErrorTypeInfo, "module", p_module -> name, "handler", MCScriptGetNameOfDefinitionInModule(p_module, p_handler), nil);
+}
+
 ///////////
 
 MCScriptVariableDefinition *MCScriptDefinitionAsVariable(MCScriptDefinition *self)
@@ -465,6 +470,11 @@ static bool MCScriptCallHandlerOfInstanceDirect(MCScriptInstanceRef self, MCScri
     MCTypeInfoRef t_signature;
     t_signature = self -> module -> types[p_handler -> type] -> typeinfo;
     
+    // If the handler is of context scope, then we cannot call it directly - only
+    // from a LCB frame.
+    if (p_handler -> scope == kMCScriptHandlerScopeContext)
+        return MCScriptThrowCannotCallContextHandlerError(self -> module, p_handler);
+    
     // Check the number of arguments.
     uindex_t t_required_param_count;
     t_required_param_count = MCHandlerTypeInfoGetParameterCount(t_signature);
diff --git a/libscript/src/script-object.cpp b/libscript/src/script-object.cpp
@@ -36,6 +36,7 @@ MCTypeInfoRef kMCScriptNoMatchingHandlerErrorTypeInfo;
 MCTypeInfoRef kMCScriptCannotSetReadOnlyPropertyErrorTypeInfo;
 MCTypeInfoRef kMCScriptInvalidPropertyValueErrorTypeInfo;
 MCTypeInfoRef kMCScriptNotAHandlerValueErrorTypeInfo;
+MCTypeInfoRef kMCScriptCannotCallContextHandlerErrorTypeInfo;
 
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -268,6 +269,7 @@ bool MCScriptInitialize(void)
         MCScriptCreateNamedErrorType(MCNAME("livecode.lang.CannotSetReadOnlyPropertyError"), MCSTR("Cannot set read-only property %{module}.%{property}"), kMCScriptCannotSetReadOnlyPropertyErrorTypeInfo);
         MCScriptCreateNamedErrorType(MCNAME("livecode.lang.PropertyValueTypeError"), MCSTR("Value is not of correct type for setting property - expected type %{type} for setting property %{module}.%{property}"), kMCScriptInvalidPropertyValueErrorTypeInfo);
         MCScriptCreateNamedErrorType(MCNAME("livecode.lang.NotAHandlerValueError"), MCSTR("Value is not a handler"), kMCScriptNotAHandlerValueErrorTypeInfo);
+        MCScriptCreateNamedErrorType(MCNAME("livecode.lang.CannotCallContextHandlerError"), MCSTR("Cannot call context handler"), kMCScriptCannotCallContextHandlerErrorTypeInfo);
     }
 
     return true;
diff --git a/libscript/src/script-private.h b/libscript/src/script-private.h
@@ -41,6 +41,7 @@ extern MCTypeInfoRef kMCScriptNoMatchingHandlerErrorTypeInfo;
 extern MCTypeInfoRef kMCScriptCannotSetReadOnlyPropertyErrorTypeInfo;
 extern MCTypeInfoRef kMCScriptInvalidPropertyValueErrorTypeInfo;
 extern MCTypeInfoRef kMCScriptNotAHandlerValueErrorTypeInfo;
+extern MCTypeInfoRef kMCScriptCannotCallContextHandlerErrorTypeInfo;
 
 ////////////////////////////////////////////////////////////////////////////////
 
