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/CWriteStep.h | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/SourceCode/Bond/Servo/CWriteStep.h b/SourceCode/Bond/Servo/CWriteStep.h index 6bb6b30..e8e66cf 100644 --- a/SourceCode/Bond/Servo/CWriteStep.h +++ b/SourceCode/Bond/Servo/CWriteStep.h @@ -19,8 +19,14 @@ virtual void getAttributeVector(CAttributeVector& attrubutes); virtual int onComplete(); virtual int onTimeout(); + virtual int onReadRetDataError(); inline void nextStep(); inline void resetStep(); + virtual void setRetDataDev(int dev, int size); + + public: + int getReturnData(const char*& pszData); + protected: HANDLE m_hWorkThreadHandle; @@ -33,6 +39,12 @@ char m_szBuffer[1024]; int m_nWriteDataSize; int m_nWriteDevNo; + + protected: + // return code or data + char m_szReturnBuf[1024]; + int m_nReturnDataSize; + int m_nReturnDevNo; }; } -- Gitblit v1.9.3