From 1ed415014e6391fec609c818bf31997852e51109 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Mon, 5 Jun 2017 08:43:12 +0200 Subject: [PATCH] - fixed: 'self' may never be null for native VM functions so it must always abort if null gets passed. --- src/scripting/vm/vm.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/scripting/vm/vm.h b/src/scripting/vm/vm.h index 9ebc86f00..765ba4555 100644 --- a/src/scripting/vm/vm.h +++ b/src/scripting/vm/vm.h @@ -579,7 +579,7 @@ class AActor; // callingstate - State this action was called from #define PARAM_ACTION_PROLOGUE(type) \ PARAM_PROLOGUE; \ - PARAM_OBJECT (self, AActor); \ + PARAM_OBJECT_NOT_NULL (self, AActor); \ PARAM_OBJECT (stateowner, type) \ PARAM_POINTER (stateinfo, FStateParamInfo) \ @@ -588,12 +588,12 @@ class AActor; #define PARAM_SELF_PROLOGUE(type) \ PARAM_PROLOGUE; \ - PARAM_OBJECT(self, type); + PARAM_OBJECT_NOT_NULL(self, type); // for structs we cannot do a class validation #define PARAM_SELF_STRUCT_PROLOGUE(type) \ PARAM_PROLOGUE; \ - PARAM_POINTER(self, type); + PARAM_POINTER_NOT_NULL(self, type); class PFunction;