i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AutoDeleter calls the destructor operator also when the object is NULL,

Browse Source 
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
This commit is contained in:
Ingo Weinhold
2008-07-29 01:48:38 +00:00
parent cfae07b6ac
commit fe00c1a5ea
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/shared/AutoDeleter.h
+2 -2
View File
@@ -134,7 +134,7 @@ struct CObjectDelete
{ {
inline void operator()(Type *object) inline void operator()(Type *object)
{ {
if (fDestructor != NULL) if (fDestructor != NULL && object != NULL)
fDestructor(object); fDestructor(object);
} }
@@ -175,7 +175,7 @@ struct MethodDelete
{ {
inline void operator()(Type *object) inline void operator()(Type *object)
{ {
if (fDestructor) if (fDestructor && object != NULL)
(object->*fDestructor)(); (object->*fDestructor)();
} }