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/CEqModeStep.cpp | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEqModeStep.cpp b/SourceCode/Bond/Servo/CEqModeStep.cpp
index 70787df..edb3eec 100644
--- a/SourceCode/Bond/Servo/CEqModeStep.cpp
+++ b/SourceCode/Bond/Servo/CEqModeStep.cpp
@@ -4,7 +4,7 @@
namespace SERVO {
- CEqModeStep::CEqModeStep() : CStep()
+ CEqModeStep::CEqModeStep() : CReadStep()
{
m_nModeDev = 0;
m_nMode = 0;
@@ -17,21 +17,22 @@
void CEqModeStep::getAttributeVector(CAttributeVector& attrubutes)
{
- CStep::getAttributeVector(attrubutes);
+ CReadStep::getAttributeVector(attrubutes);
+ unsigned int weight = 31;
std::string strTemp;
attrubutes.addAttribute(new CAttribute("Mode",
- std::to_string(m_nMode).c_str(), getModeDescription(strTemp).c_str()));
+ std::to_string(m_nMode).c_str(), getModeDescription(strTemp).c_str(), weight++));
attrubutes.addAttribute(new CAttribute("Mode Dev",
- std::to_string(m_nModeDev).c_str(), ""));
+ ("W" + CToolUnits::toHexString(m_nModeDev, strTemp)).c_str(), "", weight++));
}
int CEqModeStep::onReadData()
{
- CStep::onReadData();
+ CReadStep::onReadData();
DWordContainer dc;
- if (0 != m_pCclink->ReadDWordData(m_station, DeviceType::W, m_nModeDev, 1, dc)) {
+ if (0 != m_pCclink->ReadDWordDataEx(m_station, DeviceType::W, m_nModeDev, 1, dc)) {
return -2;
}
if (dc.size() < 1) {
@@ -48,7 +49,7 @@
int CEqModeStep::onComplete()
{
- CStep::onComplete();
+ CReadStep::onComplete();
LOGI("<CEqModeStep> onComplete.");
return 0;
@@ -56,7 +57,7 @@
int CEqModeStep::onTimeout()
{
- CStep::onTimeout();
+ CReadStep::onTimeout();
LOGI("<CEqModeStep> onTimeout.");
return 0;
--
Gitblit v1.9.3