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/CEquipmentPage3.cpp | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipmentPage3.cpp b/SourceCode/Bond/Servo/CEquipmentPage3.cpp
index ed1aae9..4f4e440 100644
--- a/SourceCode/Bond/Servo/CEquipmentPage3.cpp
+++ b/SourceCode/Bond/Servo/CEquipmentPage3.cpp
@@ -31,8 +31,8 @@
ON_WM_CTLCOLOR()
ON_WM_DESTROY()
ON_WM_SIZE()
- ON_BN_CLICKED(IDC_BUTTON_DISPATCHING_MODE_EAP, &CEquipmentPage3::OnBnClickedButtonDispatchingModeEap)
- ON_BN_CLICKED(IDC_BUTTON_DISPATCHING_MODE_LOCAL, &CEquipmentPage3::OnBnClickedButtonDispatchingModeLocal)
+ ON_BN_CLICKED(IDC_RADIO_DISPATCHING_EAP, &CEquipmentPage3::OnBnClickedRadioEap)
+ ON_BN_CLICKED(IDC_RADIO_DISPATCHING_LOCAL, &CEquipmentPage3::OnBnClickedRadioLocal)
END_MESSAGE_MAP()
@@ -81,7 +81,7 @@
// TODO: 鍦ㄦ澶勬坊鍔犳秷鎭鐞嗙▼搴忎唬鐮�
}
-void CEquipmentPage3::OnBnClickedButtonDispatchingModeEap()
+void CEquipmentPage3::OnBnClickedRadioEap()
{
ASSERT(m_pEquipment);
m_pEquipment->setDispatchingMode(SERVO::DISPATCHING_MODE::EAS,
@@ -91,7 +91,7 @@
AfxMessageBox("璁剧疆EAS妯″紡鎴愬姛锛�");
}
else {
- LOGI("<CEquipment-%s>璁剧疆DispatchingMode澶辫触锛宑ode:%d", m_pEquipment->getName().c_str(), code);
+ LOGE("<CEquipment-%s>璁剧疆DispatchingMode澶辫触锛宑ode:%d", m_pEquipment->getName().c_str(), code);
AfxMessageBox("璁剧疆EAS妯″紡澶辫触锛�");
}
@@ -99,10 +99,11 @@
});
}
-void CEquipmentPage3::OnBnClickedButtonDispatchingModeLocal()
+
+void CEquipmentPage3::OnBnClickedRadioLocal()
{
ASSERT(m_pEquipment);
- m_pEquipment->setDispatchingMode(SERVO::DISPATCHING_MODE::Local,
+ m_pEquipment->setDispatchingMode(SERVO::DISPATCHING_MODE::Local,
[&](int code) -> int {
if (code == WOK) {
LOGI("<CEquipment-%s>璁剧疆DispatchingMode鎴愬姛.", m_pEquipment->getName().c_str());
--
Gitblit v1.9.3