浏览代码

client/NetpacksClient.cpp: Called C++ object pointer is null

Null pointers should not be dereferenced
Alexander Wilms 2 年之前
父节点
当前提交
d2c03773cd
共有 1 个文件被更改,包括 16 次插入8 次删除
  1. 16 8
      client/NetPacksClient.cpp

+ 16 - 8
client/NetPacksClient.cpp

@@ -367,19 +367,27 @@ void ApplyClientNetPackVisitor::visitGiveBonus(GiveBonus & pack)
 void ApplyFirstClientNetPackVisitor::visitChangeObjPos(ChangeObjPos & pack)
 {
 	CGObjectInstance *obj = gs.getObjInstance(pack.objid);
-	if(CGI->mh)
-		CGI->mh->onObjectFadeOut(obj, pack.initiator);
-
-	CGI->mh->waitForOngoingAnimations();
+	if(CGI)
+	{
+		if(CGI->mh)
+		{
+			CGI->mh->onObjectFadeOut(obj, pack.initiator);
+			CGI->mh->waitForOngoingAnimations();
+		}
+	}
 }
 
 void ApplyClientNetPackVisitor::visitChangeObjPos(ChangeObjPos & pack)
 {
 	CGObjectInstance *obj = gs.getObjInstance(pack.objid);
-	if(CGI->mh)
-		CGI->mh->onObjectFadeIn(obj, pack.initiator);
-
-	CGI->mh->waitForOngoingAnimations();
+	if(CGI)
+	{
+		if(CGI->mh)
+		{
+			CGI->mh->onObjectFadeIn(obj, pack.initiator);
+			CGI->mh->waitForOngoingAnimations();
+		}
+	}
 	cl.invalidatePaths();
 }