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/CJobDataB.cpp | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/CJobDataB.cpp b/SourceCode/Bond/Servo/CJobDataB.cpp
index 9c00cb7..7622790 100644
--- a/SourceCode/Bond/Servo/CJobDataB.cpp
+++ b/SourceCode/Bond/Servo/CJobDataB.cpp
@@ -8,11 +8,35 @@
{
m_nCassetteSequenceNo = 0;
m_nJobSequenceNo = 0;
+ m_pOwner = nullptr;
+ }
+
+ CJobDataB::CJobDataB(CJobDataB&& other) noexcept
+ {
+ copy(&other);
}
CJobDataB::~CJobDataB()
{
+ }
+
+ void CJobDataB::copy(CJobDataB* pScr)
+ {
+ m_nCassetteSequenceNo = pScr->m_nCassetteSequenceNo;
+ m_nJobSequenceNo = pScr->m_nJobSequenceNo;
+ m_strGlassId = pScr->m_strGlassId;
+ m_pOwner = pScr->m_pOwner;
+ }
+
+ void* CJobDataB::getOwner()
+ {
+ return m_pOwner;
+ }
+
+ void CJobDataB::setOwner(void* pOwner)
+ {
+ m_pOwner = pOwner;
}
int CJobDataB::getCassetteSequenceNo()
@@ -47,7 +71,7 @@
int CJobDataB::serialize(char* pszBuffer, int nBufferSize)
{
- if (nBufferSize < 28) return -1;
+ if (nBufferSize < JOBDATAB_SIZE) return -1;
int index = 0;
memcpy(&pszBuffer[index], &m_nCassetteSequenceNo, sizeof(short));
@@ -60,12 +84,12 @@
memcpy(&pszBuffer[index], m_strGlassId.c_str(), strLen);
index += 20;
- return 14 * 2;
+ return JOBDATAB_SIZE;
}
int CJobDataB::unserialize(const char* pszBuffer, int nBufferSize)
{
- if (nBufferSize < 14) return -1;
+ if (nBufferSize < 14 * 2) return -1;
int index = 0;
memcpy(&m_nCassetteSequenceNo, &pszBuffer[index], sizeof(short));
--
Gitblit v1.9.3