Pārlūkot izejas kodu

#IQRV #comment 修复cpy的缺陷

80374374 3 nedēļas atpakaļ
vecāks
revīzija
51c0b81eae
1 mainītis faili ar 7 papildinājumiem un 2 dzēšanām
  1. 7 2
      Module/mod_heartbeat/HeartBeatFSM.cpp

+ 7 - 2
Module/mod_heartbeat/HeartBeatFSM.cpp

@@ -1199,10 +1199,15 @@ void HeartBeatConnection::SendCardActive(const int type,const int slot,unsigned
 		req.type = type;
 		req.slot = slot;
 
+		//strncpy_s(req.FromTerminalNo, sizeof(req.FromTerminalNo), m_TerminalNo.GetData(), m_TerminalNo.GetLength());
+		//strncpy_s(req.Account, sizeof(req.Account), account, accSize);
+		//strncpy_s(req.TerminalNo, sizeof(req.TerminalNo), termNo, strlen(termNo));
+		//strncpy_s(req.Param2, sizeof(req.Param2), data, dataSize);
+
 		strcpy_s(req.FromTerminalNo, sizeof(req.FromTerminalNo), m_TerminalNo.GetData());
 		strcpy_s(req.Account, sizeof(req.Account), account);
 		strcpy_s(req.TerminalNo, sizeof(req.TerminalNo), termNo);
-		strcpy_s(req.Param2, sizeof(req.Param2), data);
+		strcpy_s(req.Param2, sizeof(req.Param2), (data == NULL) ? "" : data);
 
 		CSmartPointer<IPackage> pkt = CreateNewPackage("CARDACT");
 		pkt->AddStruct("INSREQX", false, false, (LPBYTE)&req, sizeof(CardActiveReq));
@@ -1224,7 +1229,7 @@ void HeartBeatConnection::SendCardActive(const int type,const int slot,unsigned
 		strcpy_s(req.FromTerminalNo, sizeof(req.FromTerminalNo), m_TerminalNo.GetData());
 		strcpy_s(req.Account, sizeof(req.Account), account);
 		strcpy_s(req.TerminalNo, sizeof(req.TerminalNo), termNo);
-		strcpy_s(req.Param2, sizeof(req.Param2), data);
+		strcpy_s(req.Param2, sizeof(req.Param2), (data == NULL) ? "" : data);
 
 		CSmartPointer<IPackage> pkt = CreateNewPackage("CARDACT");
 		pkt->AddStruct("INSREQX", false, false, (LPBYTE)&req, sizeof(CardActiveReq));