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/CEqVcrEventStep.cpp | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEqVcrEventStep.cpp b/SourceCode/Bond/Servo/CEqVcrEventStep.cpp
index d98d170..0d88dac 100644
--- a/SourceCode/Bond/Servo/CEqVcrEventStep.cpp
+++ b/SourceCode/Bond/Servo/CEqVcrEventStep.cpp
@@ -23,21 +23,22 @@
{
CReadStep::getAttributeVector(attrubutes);
+ unsigned int weight = 31;
std::string strTemp;
attrubutes.addAttribute(new CAttribute("Dev",
- ("W" + CToolUnits::toHexString(m_nVcrEventReportDev, strTemp)).c_str(), ""));
+ ("W" + CToolUnits::toHexString(m_nVcrEventReportDev, strTemp)).c_str(), "", weight++));
attrubutes.addAttribute(new CAttribute("GlassId",
- m_vcrEventReport.getGlassId().c_str(), ""));
+ m_vcrEventReport.getGlassId().c_str(), "", weight++));
attrubutes.addAttribute(new CAttribute("CassetteSequenceNo",
- std::to_string(m_vcrEventReport.getCassetteSequenceNo()).c_str(), ""));
+ std::to_string(m_vcrEventReport.getCassetteSequenceNo()).c_str(), "", weight++));
attrubutes.addAttribute(new CAttribute("JobSequenceNo",
- std::to_string(m_vcrEventReport.getJobSequenceNo()).c_str(), ""));
+ std::to_string(m_vcrEventReport.getJobSequenceNo()).c_str(), "", weight++));
attrubutes.addAttribute(new CAttribute("UnitNo",
- std::to_string(m_vcrEventReport.getUnitNo()).c_str(), ""));
+ std::to_string(m_vcrEventReport.getUnitNo()).c_str(), "", weight++));
attrubutes.addAttribute(new CAttribute("VCR No",
- std::to_string(m_vcrEventReport.getVcrNo()).c_str(), ""));
+ std::to_string(m_vcrEventReport.getVcrNo()).c_str(), "", weight++));
attrubutes.addAttribute(new CAttribute("VCR Result",
- m_vcrEventReport.getVcrResultDescription(strTemp).c_str(), ""));
+ m_vcrEventReport.getVcrResultDescription(strTemp).c_str(), "", weight++));
}
int CEqVcrEventStep::onReadData()
@@ -53,7 +54,7 @@
}
m_vcrEventReport.unserialize(szBuffer, 60);
- LOGI("<CEqVcrEventStep-%s>Read VCR Event Report\n", m_strName.c_str());
+ LOGI("<CEqVcrEventStep-%s>Read VCR Event Report", m_strName.c_str());
return 0;
}
@@ -69,7 +70,7 @@
int CEqVcrEventStep::onTimeout()
{
CReadStep::onTimeout();
- LOGI("<CEqVcrEventStep> onTimeout.");
+ LOGE("<CEqVcrEventStep> onTimeout.");
return 0;
}
@@ -78,5 +79,13 @@
{
return &m_vcrEventReport;
}
+
+ int CEqVcrEventStep::setReturnCode(short code)
+ {
+ memcpy(m_szReturnBuf, &code, sizeof(short));
+ m_nReturnDataSize = sizeof(short);
+
+ return 0;
+ }
}
--
Gitblit v1.9.3