From cacced7e507f7603bacc03ae2616e58f0ede122a Mon Sep 17 00:00:00 2001
From: Hein-Pieter van Braam
Date: Thu, 24 Aug 2017 22:58:51 +0200
Subject: Convert Object::cast_to() to the static version

Currently we rely on some undefined behavior when Object->cast_to() gets
called with a Null pointer. This used to work fine with GCC < 6 but
newer versions of GCC remove all codepaths in which the this pointer is
Null. However, the non-static cast_to() was supposed to be null safe.

This patch makes cast_to() Null safe and removes the now redundant Null
checks where they existed.

It is explained in this article: https://www.viva64.com/en/b/0226/
---
 core/variant_parser.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/variant_parser.cpp')

diff --git a/core/variant_parser.cpp b/core/variant_parser.cpp
index 5aa71f670..a1b168621 100644
--- a/core/variant_parser.cpp
+++ b/core/variant_parser.cpp
@@ -742,7 +742,7 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream,
 						return err;
 
 					if (token.type == TK_PARENTHESIS_CLOSE) {
-						Reference *reference = obj->cast_to<Reference>();
+						Reference *reference = Object::cast_to<Reference>(obj);
 						if (reference) {
 							value = REF(reference);
 						} else {
-- 
cgit v1.2.3-70-g09d2