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/BondEq/CProjectPageComponents.cpp | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/SourceCode/Bond/BondEq/CProjectPageComponents.cpp b/SourceCode/Bond/BondEq/CProjectPageComponents.cpp
index 9c4032c..e6eb9f5 100644
--- a/SourceCode/Bond/BondEq/CProjectPageComponents.cpp
+++ b/SourceCode/Bond/BondEq/CProjectPageComponents.cpp
@@ -6,6 +6,7 @@
#include "CProjectPageComponents.h"
#include "afxdialogex.h"
#include "Alarm.h"
+#include "AlarmMonitor.h"
// CProjectPageComponents 瀵硅瘽妗�
@@ -13,7 +14,7 @@
IMPLEMENT_DYNAMIC(CProjectPageComponents, CDialogEx)
CProjectPageComponents::CProjectPageComponents(CWnd* pParent /*=nullptr*/)
- : CDialogEx(IDD_PROJECT_PAGE_COMPENTS, pParent)
+ : CDialogEx(IDD_PROJECT_PAGE_COMPONENTS, pParent)
{
m_crBkgnd = PROPAGE_BACKGROUND_COLOR;
m_hbrBkgnd = nullptr;
@@ -72,18 +73,16 @@
}
}
}
- else if (RX_CODE_ALARM_EVENT == code) {
- CComponent* pComponent = nullptr;
- CAlarm* pAlarm = nullptr;
- pAny->getObject("obj", (IRxObject*&)pAlarm);
+ else if (RX_CODE_ALARM_ON == code
+ || RX_CODE_ALARM_OFF == code) {
+ CAlarmMonitor* pComponent = nullptr;
pAny->getPtrValue("ptr", (void*&)pComponent);
ASSERT(pComponent);
- ASSERT(pAlarm);
HTREEITEM hItem = getTreeItem(pComponent);
if (hItem != nullptr) {
- if(pAlarm->getStatus() == 1)
+ if (pComponent->isAlarming())
m_treeComponents.ShowItemBadgeDotMode(hItem);
- else if (pAlarm->getStatus() == 2)
+ else
m_treeComponents.HideItemBadge(hItem);
}
}
--
Gitblit v1.9.3