libscript: Don't mix enum types.

peter-b · peter-b · commit 5d59fd352dd8 · 2016-10-24T22:26:07.000+01:00
The on-disk value saved in the compiled LCB bytecode for the mode of a
handler parameter (`in`/`out`/`inout`) is described by the
`MCScriptHandlerTypeParameterMode` enumeration.  However, when
constructing an `MCHandlerTypeInfo` value for use at runtime, these
values need to be translated to the `MCHandlerTypeFieldMode`
enumeration.  This patch adds an explicit `inline` conversion method
to the `MCScriptHandlerTypeParameter` structure.

Coverity-Id: 16984
diff --git a/libscript/src/script-module.cpp b/libscript/src/script-module.cpp
@@ -728,7 +728,7 @@ bool MCScriptEnsureModuleIsUsable(MCScriptModuleRef self)
                 for(uindex_t j = 0; j < t_type -> parameter_count; j++)
                 {
                     MCHandlerTypeFieldInfo t_parameter;
-                    t_parameter . mode = (MCHandlerTypeFieldMode)t_type -> parameters[j] . mode;
+                    t_parameter . mode = t_type -> parameters[j] . GetFieldMode();
                     t_parameter . type = self -> types[t_type -> parameters[j] . type] -> typeinfo;
                     if (!t_parameters . Push(t_parameter))
 						goto error_cleanup;
diff --git a/libscript/src/script-private.h b/libscript/src/script-private.h
@@ -155,6 +155,24 @@ struct MCScriptHandlerTypeParameter
 {
     MCScriptHandlerTypeParameterMode mode;
     uindex_t type;
+
+	/* Translate the mode of this parameter from a
+	 * MCScriptHandlerTypeParameterMode to an
+	 * MCHandlerTypeFieldMode. */
+	inline MCHandlerTypeFieldMode GetFieldMode() const
+	{
+		switch (mode)
+		{
+		case kMCScriptHandlerTypeParameterModeIn:
+			return kMCHandlerTypeFieldModeIn;
+		case kMCScriptHandlerTypeParameterModeOut:
+			return kMCHandlerTypeFieldModeOut;
+		case kMCScriptHandlerTypeParameterModeInOut:
+			return kMCHandlerTypeFieldModeInOut;
+		default:
+			MCUnreachableReturn(kMCHandlerTypeFieldModeIn);
+		}
+	}
 };
 
 struct MCScriptHandlerType: public MCScriptType

Original file line number	Diff line number	Diff line change
`@@ -728,7 +728,7 @@ bool MCScriptEnsureModuleIsUsable(MCScriptModuleRef self)`
`728`	`728`	`for(uindex_t j = 0; j < t_type -> parameter_count; j++)`
`729`	`729`	`{`
`730`	`730`	`MCHandlerTypeFieldInfo t_parameter;`
`731`		`- t_parameter . mode = (MCHandlerTypeFieldMode)t_type -> parameters[j] . mode;`
	`731`	`+ t_parameter . mode = t_type -> parameters[j] . GetFieldMode();`
`732`	`732`	`t_parameter . type = self -> types[t_type -> parameters[j] . type] -> typeinfo;`
`733`	`733`	`if (!t_parameters . Push(t_parameter))`
`734`	`734`	`goto error_cleanup;`