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/reference.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'core/reference.h') diff --git a/core/reference.h b/core/reference.h index 764c924cd..a8034a73c 100644 --- a/core/reference.h +++ b/core/reference.h @@ -180,7 +180,7 @@ public: return; } Ref r; - r.reference = refb->cast_to(); + r.reference = Object::cast_to(refb); ref(r); r.reference = NULL; } @@ -194,7 +194,7 @@ public: return; } Ref r; - r.reference = refb->cast_to(); + r.reference = Object::cast_to(refb); ref(r); r.reference = NULL; } @@ -209,7 +209,7 @@ public: return; } Ref r; - r.reference = refb->cast_to(); + r.reference = Object::cast_to(refb); ref(r); r.reference = NULL; } @@ -230,7 +230,7 @@ public: return; } Ref r; - r.reference = refb->cast_to(); + r.reference = Object::cast_to(refb); ref(r); r.reference = NULL; } @@ -254,7 +254,7 @@ public: return; } Ref r; - r.reference = refb->cast_to(); + r.reference = Object::cast_to(refb); ref(r); r.reference = NULL; } @@ -269,7 +269,7 @@ public: return; } Ref r; - r.reference = refb->cast_to(); + r.reference = Object::cast_to(refb); ref(r); r.reference = NULL; } -- cgit v1.2.3-70-g09d2