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/ref_ptr.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core/ref_ptr.cpp') diff --git a/core/ref_ptr.cpp b/core/ref_ptr.cpp index c2128fd45d..7bd8523292 100644 --- a/core/ref_ptr.cpp +++ b/core/ref_ptr.cpp @@ -69,7 +69,7 @@ RID RefPtr::get_rid() const { Ref *ref = reinterpret_cast *>(&data[0]); if (ref->is_null()) return RID(); - Resource *res = (*ref)->cast_to(); + Resource *res = Object::cast_to(ref->ptr()); if (res) return res->get_rid(); return RID(); -- cgit v1.2.3