From d7c88780e1df54f34563d60bd7fa01011d2eef03 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期一, 26 一月 2026 23:17:17 +0800
Subject: [PATCH] 1.CSVData.cpp 里 unserialize 用了 8*2、125*2，但 serialize 只写 8 + 125 字节。 m_svRawData.insert 的 end 指针是 pszBuffer + 125*2，没有用 index 计算，可能把无效区域一起拷进去。 一旦 size 实际是 133（不是 266），就会直接越界，堆会被破坏，m_svDatas.clear() 在销毁元素时崩。
---
SourceCode/Bond/Servo/CPortStatusReport.cpp | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/Servo/CPortStatusReport.cpp b/SourceCode/Bond/Servo/CPortStatusReport.cpp
index 03864e2..0d6fa95 100644
--- a/SourceCode/Bond/Servo/CPortStatusReport.cpp
+++ b/SourceCode/Bond/Servo/CPortStatusReport.cpp
@@ -51,6 +51,11 @@
return m_nPortStatus;
}
+ void CPortStatusReport::setPortStatus(short status)
+ {
+ m_nPortStatus = status;
+ }
+
short CPortStatusReport::getCassetteSequenceNo()
{
return m_nCassetteSequenceNo;
@@ -134,9 +139,6 @@
memcpy(&m_nLoadingCassetteType, &pszBuffer[index], sizeof(short));
index += sizeof(short);
- memcpy(&m_nLoadingCassetteType, &pszBuffer[index], sizeof(short));
- index += sizeof(short);
-
memcpy(&m_nQTimeFlag, &pszBuffer[index], sizeof(short));
index += sizeof(short);
@@ -146,7 +148,7 @@
memcpy(&m_nCassetteStatus, &pszBuffer[index], sizeof(short));
index += sizeof(short);
- return 15 * 2;
+ return 32 * 2;
}
void CPortStatusReport::getAttributeVector(CAttributeVector& attrubutes, int beginWeight)
@@ -237,6 +239,21 @@
return false;
}
+ short CPortStatusReport::getJobExistenceSlot()
+ {
+ return m_nJobExistenceSlot[0];
+ }
+
+ void CPortStatusReport::setJobExistenceSlot(short map)
+ {
+ m_nJobExistenceSlot[0] = map;
+ }
+
+ void CPortStatusReport::setCassetteId(const char* pszId)
+ {
+ m_strCassetteID = pszId;
+ }
+
void CPortStatusReport::WriteString(CArchive& ar, std::string& string)
{
CString strTemp = string.c_str();
--
Gitblit v1.9.3