漏掉一处异常时未释放内存的问题

kbengine · kbengine · commit bb21d649d780 · 2014-10-30T13:38:53.000+08:00
diff --git a/kbe/src/lib/server/components.cpp b/kbe/src/lib/server/components.cpp
@@ -309,6 +309,10 @@ int Components::connectComponent(COMPONENT_TYPE componentType, int32 uid, COMPON
 				pComponentInfos->pChannel->c_str()));
 
 			pComponentInfos->pChannel->destroy();
+			
+
+			// ��ʱ����ǿ���ͷ��ڴ棬destroy���Ѿ����������
+			// SAFE_RELEASE(pComponentInfos->pChannel);
 			pComponentInfos->pChannel = NULL;
 			return -1;
 		}
@@ -389,6 +393,7 @@ int Components::connectComponent(COMPONENT_TYPE componentType, int32 uid, COMPON
 		ERROR_MSG(fmt::format("Components::connectComponent: connect({}) is failed! {}.\n",
 			pComponentInfos->pIntAddr->c_str(), kbe_strerror()));
 
+		delete pEndpoint;
 		return -1;
 	}
 
@@ -639,7 +644,8 @@ bool Components::checkComponentPortUsable(const Components::ComponentInfos* info
 	int selgot = select(epListen+1, &fds, NULL, NULL, &tv);
 	if(selgot == 0)
 	{
-		return true;	// ��ʱ���ܶԷ���æ
+		// ��ʱ, ���ܶԷ���æ
+		return true;	
 	}
 	else if(selgot == -1)
 	{

Original file line number	Diff line number	Diff line change
`@@ -309,6 +309,10 @@ int Components::connectComponent(COMPONENT_TYPE componentType, int32 uid, COMPON`
`309`	`309`	`pComponentInfos->pChannel->c_str()));`
`310`	`310`
`311`	`311`	`pComponentInfos->pChannel->destroy();`
	`312`	`+`
	`313`	`+`
	`314`	`+ // 此时不可强制释放内存，destroy中已经对其减引用`
	`315`	`+ // SAFE_RELEASE(pComponentInfos->pChannel);`
`312`	`316`	`pComponentInfos->pChannel = NULL;`
`313`	`317`	`return -1;`
`314`	`318`	`}`
`@@ -389,6 +393,7 @@ int Components::connectComponent(COMPONENT_TYPE componentType, int32 uid, COMPON`
`389`	`393`	`ERROR_MSG(fmt::format("Components::connectComponent: connect({}) is failed! {}.\n",`
`390`	`394`	`pComponentInfos->pIntAddr->c_str(), kbe_strerror()));`
`391`	`395`
	`396`	`+ delete pEndpoint;`
`392`	`397`	`return -1;`
`393`	`398`	`}`
`394`	`399`
`@@ -639,7 +644,8 @@ bool Components::checkComponentPortUsable(const Components::ComponentInfos* info`
`639`	`644`	`int selgot = select(epListen+1, &fds, NULL, NULL, &tv);`
`640`	`645`	`if(selgot == 0)`
`641`	`646`	`{`
`642`		`- return true; // 超时可能对方繁忙`
	`647`	`+ // 超时, 可能对方繁忙`
	`648`	`+ return true;`
`643`	`649`	`}`
`644`	`650`	`else if(selgot == -1)`
`645`	`651`	`{`