From 0de01bd32e6b03eb370a74391b411b5d442d5d12 Mon Sep 17 00:00:00 2001 From: Yesterday's Voyage Date: Sun, 15 Feb 2009 19:26:50 +0000 Subject: [PATCH] Make some division checks safer (cherry picked from commit 5534cd3af85f618246a4b15c8e83b8fe92e1a082) --- hdrs/dbdefs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hdrs/dbdefs.h b/hdrs/dbdefs.h index df23cc0..cfd6a94 100644 --- a/hdrs/dbdefs.h +++ b/hdrs/dbdefs.h @@ -66,7 +66,7 @@ extern dbref first_free; /* pointer to free list */ #define IsRoom(x) (!!(Typeof(x) & TYPE_ROOM)) #define IsThing(x) (!!(Typeof(x) & TYPE_THING)) #define IsExit(x) (!!(Typeof(x) & TYPE_EXIT)) -#define IsDivision(x) (!!(Typeof(x) & TYPE_DIVISION)) +#define IsDivision(x) (GoodObject(x) && !!(Typeof(x) & TYPE_DIVISION)) #define IsMasterDivision(x) (GoodObject(x) && IsDivision(x) && Division(x) == NOTHING) /* Was Destroyed() */ -- 2.30.2