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 | 100 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 79 insertions(+), 21 deletions(-)
diff --git a/SourceCode/Bond/Servo/CJobDataB.cpp b/SourceCode/Bond/Servo/CJobDataB.cpp
index efa4896..7622790 100644
--- a/SourceCode/Bond/Servo/CJobDataB.cpp
+++ b/SourceCode/Bond/Servo/CJobDataB.cpp
@@ -1,11 +1,19 @@
#include "stdafx.h"
#include "CJobDataB.h"
+#include "ToolUnits.h"
namespace SERVO {
CJobDataB::CJobDataB()
{
+ m_nCassetteSequenceNo = 0;
+ m_nJobSequenceNo = 0;
+ m_pOwner = nullptr;
+ }
+ CJobDataB::CJobDataB(CJobDataB&& other) noexcept
+ {
+ copy(&other);
}
CJobDataB::~CJobDataB()
@@ -13,36 +21,86 @@
}
+ 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()
+ {
+ return m_nCassetteSequenceNo;
+ }
+
+ void CJobDataB::setCassetteSequenceNo(int no)
+ {
+ m_nCassetteSequenceNo = no;
+ }
+
+ int CJobDataB::getJobSequenceNo()
+ {
+ return m_nJobSequenceNo;
+ }
+
+ void CJobDataB::setJobSequenceNo(int no)
+ {
+ m_nJobSequenceNo = no;
+ }
+
+ std::string& CJobDataB::getGlassId()
+ {
+ return m_strGlassId;
+ }
+
+ void CJobDataB::setGlassId(const char* pszGlassId)
+ {
+ m_strGlassId = pszGlassId;
+ }
+
int CJobDataB::serialize(char* pszBuffer, int nBufferSize)
{
+ if (nBufferSize < JOBDATAB_SIZE) return -1;
+
int index = 0;
- memcpy(&pszBuffer[index], &m_nPortNo, sizeof(short));
+ memcpy(&pszBuffer[index], &m_nCassetteSequenceNo, sizeof(short));
index += sizeof(short);
- int strLen = min(20, m_strCarrierId.size());
- memcpy(&pszBuffer[index], m_strCarrierId.c_str(), strLen);
- index += strLen;
-
- strLen = min(20, m_pruductId.size());
- memcpy(&pszBuffer[index], m_pruductId.c_str(), strLen);
- index += strLen;
-
- memcpy(&pszBuffer[index], &m_nCarrierState, sizeof(short));
+ memcpy(&pszBuffer[index], &m_nJobSequenceNo, sizeof(short));
index += sizeof(short);
- memcpy(&pszBuffer[index], &m_nSlotMapping, sizeof(int));
- index += sizeof(int);
+ int strLen = min(20, m_strGlassId.size());
+ memcpy(&pszBuffer[index], m_strGlassId.c_str(), strLen);
+ index += 20;
- memcpy(&pszBuffer[index], &m_nSlotSelectedFlag, sizeof(int));
- index += sizeof(int);
+ return JOBDATAB_SIZE;
+ }
- for (int i = 0; i < min(25, m_glassIds.size()); i++) {
- std::string& strGlassId = m_glassIds.at(i);
- strLen = min(20, strGlassId.size());
- memcpy(&pszBuffer[index], strGlassId.c_str(), strLen);
- index += strLen;
- }
+ int CJobDataB::unserialize(const char* pszBuffer, int nBufferSize)
+ {
+ if (nBufferSize < 14 * 2) return -1;
- return 320 * 2;
+ int index = 0;
+ memcpy(&m_nCassetteSequenceNo, &pszBuffer[index], sizeof(short));
+ index += sizeof(short);
+
+ memcpy(&m_nJobSequenceNo, &pszBuffer[index], sizeof(short));
+ index += sizeof(short);
+
+ CToolUnits::convertString(&pszBuffer[index], 20, m_strGlassId);
+ index += 20;
+
+ return 14 * 2;
}
}
--
Gitblit v1.9.3