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/CEqReadIntStep.cpp | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEqReadIntStep.cpp b/SourceCode/Bond/Servo/CEqReadIntStep.cpp
index c6de8df..4625674 100644
--- a/SourceCode/Bond/Servo/CEqReadIntStep.cpp
+++ b/SourceCode/Bond/Servo/CEqReadIntStep.cpp
@@ -27,11 +27,12 @@
{
CReadStep::getAttributeVector(attrubutes);
+ unsigned int weight = 31;
std::string strTemp;
attrubutes.addAttribute(new CAttribute("Dev",
- ("W" + CToolUnits::toHexString(m_nValueDev, strTemp)).c_str(), ""));
+ ("W" + CToolUnits::toHexString(m_nValueDev, strTemp)).c_str(), "", weight++));
attrubutes.addAttribute(new CAttribute("Value",
- std::to_string(m_nValue).c_str(), ""));
+ std::to_string(m_nValue).c_str(), "", weight++));
}
int CEqReadIntStep::onReadData()
@@ -62,7 +63,7 @@
int CEqReadIntStep::onComplete()
{
CReadStep::onComplete();
- LOGI("<CEQPortChangeStep> onComplete.");
+ LOGI("<CEqReadIntStep> onComplete.");
return 0;
}
@@ -70,7 +71,7 @@
int CEqReadIntStep::onTimeout()
{
CReadStep::onTimeout();
- LOGI("<CEQPortChangeStep> onTimeout.");
+ LOGE("<CEqReadIntStep> onTimeout.");
return 0;
}
--
Gitblit v1.9.3