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.h | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/CPortStatusReport.h b/SourceCode/Bond/Servo/CPortStatusReport.h
index 4aede52..fb73f36 100644
--- a/SourceCode/Bond/Servo/CPortStatusReport.h
+++ b/SourceCode/Bond/Servo/CPortStatusReport.h
@@ -9,11 +9,12 @@
{
public:
CPortStatusReport();
- ~CPortStatusReport();
+ virtual ~CPortStatusReport();
public:
void copyEx(CPortStatusReport& other);
short getPortStatus();
+ void setPortStatus(short status);
short getCassetteSequenceNo();
std::string& getCassetteId();
short getLoadingCassetteType();
@@ -23,10 +24,18 @@
int serialize(char* pszBuffer, int nBufferSize);
int unserialize(const char* pszBuffer, int nBufferSize);
void getAttributeVector(CAttributeVector& attrubutes, int beginWeight);
-
+ virtual void serialize(CArchive& ar);
+
public:
bool canPickFromPort();
bool isJobExistenceSlot();
+ short getJobExistenceSlot();
+ void setJobExistenceSlot(short map);
+ void setCassetteId(const char* pszId);
+
+ private:
+ void WriteString(CArchive& ar, std::string& string);
+ void ReadString(CArchive& ar, std::string& string);
private:
short m_nPortStatus;
@@ -35,7 +44,7 @@
short m_nJobExistenceSlot[12]; // 12 * 16 = 192 个slot是否存在glass
short m_nLoadingCassetteType; // 1: Actual Cassette 2 : Empty Cassette
short m_nQTimeFlag;
- short m_nCassetteMappingState; // 1: mapping use 2: mapping not use
+ short m_nCassetteMappingState; // 1: mapping use, 2: mapping not use
short m_nCassetteStatus;
};
}
--
Gitblit v1.9.3