Check for null object in Reflect.callMethod. Closes https://github.com/HaxeFoundation/hxcpp/issues/593

std/cpp/ErrorConstants.hx

@@ -0,0 +1,42 @@
+/*
+ * Copyright (C)2005-2017 Haxe Foundation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+package cpp;
+
+extern class ErrorConstants
+{
+   @:native("HX_INVALID_CAST")
+   public static var invalidCast:Dynamic;
+
+   @:native("HX_INDEX_OUT_OF_BOUNDS")
+   public static var indexOutOfBounds:Dynamic;
+
+   @:native("HX_INVALID_OBJECT")
+   public static var invalidObject:Dynamic;
+
+   @:native("HX_INVALID_ARG_COUNT")
+   public static var invalidArgCount:Dynamic;
+
+   @:native("HX_NULL_FUNCTION_POINTER")
+   public static var nullFunctionPointer:Dynamic;
+}
+

std/cpp/_std/Reflect.hx

@@ -49,8 +49,11 @@ class Reflect {
 	}
 
 	public static function callMethod( o : Dynamic, func : haxe.Constraints.Function, args : Array<Dynamic> ) : Dynamic untyped {
-			if (func!=null && func.__GetType()==ObjectType.vtString)
+			if (func!=null && func.__GetType()==ObjectType.vtString) {
+				if (o==null) throw cpp.ErrorConstants.invalidObject;
 				func = o.__Field(func,untyped __cpp__("hx::paccDynamic"));
+			}
+			if (func==null) throw cpp.ErrorConstants.nullFunctionPointer;
 			untyped func.__SetThis(o);
          return untyped func.__Run(args);
 	}