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/EAPSimulator/CLinkReportDlg.cpp | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/EAPSimulator/CLinkReportDlg.cpp b/SourceCode/Bond/EAPSimulator/CLinkReportDlg.cpp
index 0c23e25..5655fa1 100644
--- a/SourceCode/Bond/EAPSimulator/CLinkReportDlg.cpp
+++ b/SourceCode/Bond/EAPSimulator/CLinkReportDlg.cpp
@@ -183,14 +183,19 @@
CListCtrl* pListCtrl = (CListCtrl*)GetDlgItem(IDC_LIST1);
POSITION pos = pListCtrl->GetFirstSelectedItemPosition();
while (pos) {
- int nItem = pListCtrl->GetNextSelectedItem(pos); // 鑾峰彇閫変腑椤圭储寮�
+ int nItem = pListCtrl->GetNextSelectedItem(pos);
SERVO::CCollectionEvent* pEvent = (SERVO::CCollectionEvent*)pListCtrl->GetItemData(nItem);
events.push_back(pEvent);
}
+ std::map<unsigned int, std::vector<unsigned int>> mapEvent;
for (auto item : events) {
- TRACE("name:%s\n", item->getName().c_str());
+ std::vector<unsigned int> RPTIDs = item->getReportIds();
+ mapEvent[item->getEventId()] = RPTIDs;
}
+
+
+ theApp.m_model.m_pHsmsActive->hsmsLinkEventReport(mapEvent);
}
void CLinkReportDlg::OnDestroy()
--
Gitblit v1.9.3