From ff2adb04cb4be9309abeb3feeee7cad97976fc2d Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 28 May 2018 12:19:41 -0400 Subject: [PATCH] goops: Fix 'instance?' to work on objects that aren't structs. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes Reported by Tommi Höynälänmaa * module/oop/goops.scm (instance?): Check that OBJ is a struct before applying 'struct-vtable' to it. --- module/oop/goops.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/module/oop/goops.scm b/module/oop/goops.scm index 3c787d763..837a667e6 100644 --- a/module/oop/goops.scm +++ b/module/oop/goops.scm @@ -1,6 +1,7 @@ ;;;; goops.scm -- The Guile Object-Oriented Programming System ;;;; -;;;; Copyright (C) 1998-2003,2006,2009-2011,2013-2015 Free Software Foundation, Inc. +;;;; Copyright (C) 1998-2003, 2006, 2009-2011, 2013-2015, 2018 +;;;; Free Software Foundation, Inc. ;;;; Copyright (C) 1993-1998 Erick Gallesio - I3S-CNRS/ESSI ;;;; ;;;; This library is free software; you can redistribute it and/or @@ -279,7 +280,8 @@ (class-has-flags? (struct-vtable obj) vtable-flag-goops-slot))) (define-inlinable (instance? obj) - (class-has-flags? (struct-vtable obj) vtable-flag-goops-class)) + (and (struct? obj) + (class-has-flags? (struct-vtable obj) vtable-flag-goops-class))) (define (class-has-statically-allocated-slots? class) (class-has-flags? class vtable-flag-goops-static))