summaryrefslogtreecommitdiffstats
path: root/src/Entities
diff options
context:
space:
mode:
authorMarvin Kopf <marvinkopf@posteo.de>2017-04-01 23:15:08 +0200
committerMattes D <github@xoft.cz>2017-04-01 23:15:08 +0200
commitdbdcb853466f78e64274074e4709d6247f766059 (patch)
treecef517d1edda974082bcf9289d5ca85d1cd37738 /src/Entities
parentfix endless loop in StringReplace (#3658) (diff)
downloadcuberite-dbdcb853466f78e64274074e4709d6247f766059.tar
cuberite-dbdcb853466f78e64274074e4709d6247f766059.tar.gz
cuberite-dbdcb853466f78e64274074e4709d6247f766059.tar.bz2
cuberite-dbdcb853466f78e64274074e4709d6247f766059.tar.lz
cuberite-dbdcb853466f78e64274074e4709d6247f766059.tar.xz
cuberite-dbdcb853466f78e64274074e4709d6247f766059.tar.zst
cuberite-dbdcb853466f78e64274074e4709d6247f766059.zip
Diffstat (limited to 'src/Entities')
-rw-r--r--src/Entities/Entity.cpp2
-rw-r--r--src/Entities/Entity.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index a37100c8b..7b1849b9f 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -2013,7 +2013,7 @@ void cEntity::Detach(void)
bool cEntity::IsA(const char * a_ClassName) const
{
- return (strcmp(a_ClassName, "cEntity") == 0);
+ return ((a_ClassName != nullptr) && (strcmp(a_ClassName, "cEntity") == 0));
}
diff --git a/src/Entities/Entity.h b/src/Entities/Entity.h
index c9d445de7..b7778e797 100644
--- a/src/Entities/Entity.h
+++ b/src/Entities/Entity.h
@@ -12,7 +12,7 @@
#define CLASS_PROTODEF(classname) \
virtual bool IsA(const char * a_ClassName) const override\
{ \
- return ((strcmp(a_ClassName, #classname) == 0) || super::IsA(a_ClassName)); \
+ return ((a_ClassName != nullptr) && ((strcmp(a_ClassName, #classname) == 0) || super::IsA(a_ClassName))); \
} \
virtual const char * GetClass(void) const override \
{ \