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/BoounionPLC/IOMonitoringDlg.cpp | 43 +++++++++++++++++++++++++------------------
1 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/SourceCode/Bond/BoounionPLC/IOMonitoringDlg.cpp b/SourceCode/Bond/BoounionPLC/IOMonitoringDlg.cpp
index 5bc1d1c..734f047 100644
--- a/SourceCode/Bond/BoounionPLC/IOMonitoringDlg.cpp
+++ b/SourceCode/Bond/BoounionPLC/IOMonitoringDlg.cpp
@@ -27,6 +27,22 @@
m_nTotalPages = 1;
m_nRowsPerPage = 16;
m_nCols = 6;
+
+ CPLC* pPLC = theApp.m_model.getCurrentPlc();
+ if (pPLC != nullptr) {
+ m_pPLC = pPLC;
+
+ // 鍔犺浇鏁版嵁
+ IOManager manager;
+ manager.LoadFromFile(pPLC->getName());
+ manager.GetMachineData(m_displayData);
+
+ // 璁＄畻椤垫暟
+ m_nCurrentPage = 1;
+ m_nTotalPages = ((int)m_displayData.size() + m_nRowsPerPage - 1) / m_nRowsPerPage;
+ } else {
+ m_pPLC = nullptr;
+ }
}
CIOMonitoringDlg::~CIOMonitoringDlg()
@@ -46,24 +62,6 @@
{
CDialogEx::DoDataExchange(pDX);
DDX_Control(pDX, IDC_STATIC_PAGE_NUMBER, m_staticPageNum);
-}
-
-void CIOMonitoringDlg::SetIOManager(const std::string& machineName)
-{
- // 鍔犺浇鏁版嵁
- IOManager manager;
- manager.LoadFromFile(machineName);
- manager.GetMachineData(m_displayData);
-
- // 璁＄畻椤垫暟
- m_nCurrentPage = 1;
- m_nTotalPages = ((int)m_displayData.size() + m_nRowsPerPage - 1) / m_nRowsPerPage;
-}
-
-void CIOMonitoringDlg::SetPLC(CPLC* pPLC)
-{
- ASSERT(pPLC);
- m_pPLC = pPLC;
}
CFont* CIOMonitoringDlg::GetOrCreateFont(int nFontSize)
@@ -568,6 +566,15 @@
CDialogEx::OnInitDialog();
// TODO: 鍦ㄦ娣诲姞棰濆鐨勫垵濮嬪寲
+ if (m_pPLC == nullptr || !m_pPLC->isConnected()) {
+ AfxMessageBox(_T("PLC 鏈繛鎺ワ紒"));
+ return FALSE;
+ }
+
+ CString strTitle;
+ strTitle.Format(_T("IO鐩戞帶椤甸潰(PLC: %s)"), m_pPLC->getName().c_str());
+ SetWindowText(strTitle);
+
CRect screenRect, dlgRect, clientRect;
SystemParametersInfo(SPI_GETWORKAREA, 0, &screenRect, 0);
--
Gitblit v1.9.3