From fe00c1a5ea69f75147f5f5aff87cb0d5e56349cf Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 29 Jul 2008 01:48:38 +0000 Subject: [PATCH] AutoDeleter calls the destructor operator also when the object is NULL, so we need to check for that explicitly in the CObjectDeleter and MethodDeleter cases. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26673 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/shared/AutoDeleter.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/headers/private/shared/AutoDeleter.h b/headers/private/shared/AutoDeleter.h index 182501738b..2e7762ed19 100644 --- a/headers/private/shared/AutoDeleter.h +++ b/headers/private/shared/AutoDeleter.h @@ -134,7 +134,7 @@ struct CObjectDelete { inline void operator()(Type *object) { - if (fDestructor != NULL) + if (fDestructor != NULL && object != NULL) fDestructor(object); } @@ -175,7 +175,7 @@ struct MethodDelete { inline void operator()(Type *object) { - if (fDestructor) + if (fDestructor && object != NULL) (object->*fDestructor)(); }