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/Alarm.cpp | 57 ++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 46 insertions(+), 11 deletions(-)
diff --git a/SourceCode/Bond/BondEq/Alarm.cpp b/SourceCode/Bond/BondEq/Alarm.cpp
index eaa30ad..ef82a47 100644
--- a/SourceCode/Bond/BondEq/Alarm.cpp
+++ b/SourceCode/Bond/BondEq/Alarm.cpp
@@ -5,16 +5,25 @@
CAlarm::CAlarm()
{
+ m_nStatus = 0;
+ m_nId = 0;
+ m_nLevel = 0;
}
-CAlarm::CAlarm(int unitId, int status, int id, int level, const char* pszText)
+CAlarm::CAlarm(int id, int level, const char* pszText)
{
- m_nUnitId = unitId;
- m_nStatus = status;
- m_time = CToolUnits::getTimestamp();
+ m_nStatus = 0;
m_nId = id;
m_nLevel = level;
m_strText = pszText;
+}
+
+CAlarm::CAlarm(CAlarm* pScr)
+{
+ m_nStatus = 0;
+ m_nId = pScr->m_nId;
+ m_nLevel = pScr->m_nLevel;
+ m_strText = pScr->m_strText;;
}
CAlarm::~CAlarm()
@@ -31,7 +40,8 @@
{
std::string strText;
strText += "CAlarm[";
- strText += ("time:" + CToolUnits::timeToString2(m_time) + ";");
+ strText += ("m_timeOn:" + CToolUnits::timeToString2(m_timeOn) + ";");
+ strText += ("m_timeOff:" + CToolUnits::timeToString2(m_timeOff) + ";");
strText += ("m_nStatus:" + std::to_string(m_nStatus) + ";");
strText += ("m_nId:" + std::to_string(m_nId) + ";");
strText += ("m_nLevel:" + std::to_string(m_nLevel) + ";");
@@ -46,9 +56,30 @@
return m_nUnitId;
}
-ULONGLONG CAlarm::getTime()
+void CAlarm::alarmOn()
{
- return m_time;
+ if (m_nStatus == 0) {
+ m_nStatus++;
+ m_timeOn = CToolUnits::getTimestamp();
+ }
+}
+
+void CAlarm::alarmOff()
+{
+ if (m_nStatus == 1) {
+ m_nStatus++;
+ m_timeOff = CToolUnits::getTimestamp();
+ }
+}
+
+ULONGLONG CAlarm::getOnTime()
+{
+ return m_timeOn;
+}
+
+ULONGLONG CAlarm::getOffTime()
+{
+ return m_timeOff;
}
int CAlarm::getId()
@@ -76,20 +107,24 @@
if (ar.IsStoring())
{
Lock();
- ar << m_time;
- ar << m_nStatus;
+ ar << m_nUnitId;
ar << m_nId;
ar << m_nLevel;
+ ar << m_timeOn;
+ ar << m_timeOff;
+ ar << m_nStatus;
WriteString(ar, m_strText);
Unlock();
}
else
{
Lock();
- ar >> m_time;
- ar >> m_nStatus;
+ ar >> m_nUnitId;
ar >> m_nId;
ar >> m_nLevel;
+ ar >> m_timeOn;
+ ar >> m_timeOff;
+ ar >> m_nStatus;
ReadString(ar, m_strText);
Unlock();
}
--
Gitblit v1.9.3