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/CPageCassetteCtrlCmd.cpp | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/CPageCassetteCtrlCmd.cpp b/SourceCode/Bond/Servo/CPageCassetteCtrlCmd.cpp
index 16f72f7..e39bd05 100644
--- a/SourceCode/Bond/Servo/CPageCassetteCtrlCmd.cpp
+++ b/SourceCode/Bond/Servo/CPageCassetteCtrlCmd.cpp
@@ -90,7 +90,9 @@
{
ASSERT(m_pEquipment != nullptr);
ASSERT(m_pEquipment->getID() == EQ_ID_LOADPORT1
- || m_pEquipment->getID() == EQ_ID_LOADPORT2);
+ || m_pEquipment->getID() == EQ_ID_LOADPORT2
+ || m_pEquipment->getID() == EQ_ID_LOADPORT3
+ || m_pEquipment->getID() == EQ_ID_LOADPORT4);
SERVO::CLoadPort* pLoadPort = (SERVO::CLoadPort*)m_pEquipment;
short cmd = 0;
@@ -98,7 +100,7 @@
int jobExistenceSize = 12;
short slotProcess = 0;
short jobCount = 0;
- SERVO::CJobDataB* pJobDataB = new SERVO::CJobDataB();
+ SERVO::CJobDataA* pJobDataA = new SERVO::CJobDataA();
CComboBox* pComboBox = (CComboBox*)GetDlgItem(IDC_COMBO_CASSETTE_CTRL_CMD);
@@ -112,5 +114,14 @@
pLoadPort->sendCassetteCtrlCmd(cmd, &jobExistence[0], jobExistenceSize, slotProcess,
- jobCount, pJobDataB);
+ jobCount, pJobDataA, [&](int code) -> int {
+ if (code == WOK) {
+ LOGI("sendCassetteCtrlCmd 鎴愬姛.");
+ }
+ else {
+ LOGE("sendCassetteCtrlCmd 澶辫触.");
+ }
+
+ return 0;
+ });
}
--
Gitblit v1.9.3