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/HSMSSDK/Include/ISECS2Item.h | 42 ++++++++++++++++++++++++++++++++++++------ 1 files changed, 36 insertions(+), 6 deletions(-) diff --git a/SourceCode/Bond/HSMSSDK/Include/ISECS2Item.h b/SourceCode/Bond/HSMSSDK/Include/ISECS2Item.h index 638b3b3..09b9ed0 100644 --- a/SourceCode/Bond/HSMSSDK/Include/ISECS2Item.h +++ b/SourceCode/Bond/HSMSSDK/Include/ISECS2Item.h @@ -25,21 +25,51 @@ public: virtual SITYPE getType() = 0; virtual const char* toString() = 0; - virtual bool getString(char*& pszText) = 0; - virtual bool getBinary(BYTE& bin) = 0; + virtual bool getString(const char*& pszText) = 0; + virtual bool getBinary(const char*& pszData, unsigned int& len) = 0; virtual bool getBool(bool& boolValue) = 0; + virtual bool getI8(long long& value) = 0; + virtual bool getI4(int& value) = 0; + virtual bool getI2(short& value) = 0; + virtual bool getI1(char& value) = 0; + virtual bool getF8(double& value) = 0; + virtual bool getF4(float& value) = 0; + virtual bool getU8(unsigned long long& value) = 0; virtual bool getU4(unsigned int& value) = 0; + virtual bool getU2(unsigned short& value) = 0; + virtual bool getU1(unsigned char& value) = 0; virtual int getSubItemSize() = 0; virtual ISECS2Item* getSubItem(int index) = 0; - virtual bool getSubItemString(int index, char*& pszText) = 0; - virtual bool getSubItemBinary(int index, BYTE& bin) = 0; + virtual bool getSubItemString(int index, const char*& pszText) = 0; + virtual bool getSubItemBinary(int index, const char*& pszData, unsigned int& len) = 0; virtual bool getSubItemBool(int index, bool& boolValue) = 0; + virtual bool getSubItemI8(int index, long long& value) = 0; + virtual bool getSubItemI4(int index, int& value) = 0; + virtual bool getSubItemI2(int index, short& value) = 0; + virtual bool getSubItemI1(int index, char& value) = 0; + virtual bool getSubItemF8(int index, double& value) = 0; + virtual bool getSubItemF4(int index, float& value) = 0; + virtual bool getSubItemU8(int index, unsigned long long& value) = 0; virtual bool getSubItemU4(int index, unsigned int& value) = 0; + virtual bool getSubItemU2(int index, unsigned short& value) = 0; + virtual bool getSubItemU1(int index, unsigned char& value) = 0; virtual void reset() = 0; virtual ISECS2Item* addItem(const char* pszText, const char* pszNote) = 0; - virtual ISECS2Item* addBinaryItem(BYTE bin, const char* pszNote) = 0; + virtual ISECS2Item* addBinaryItem(const char* pszData, unsigned int len, const char* pszNote) = 0; virtual ISECS2Item* addBoolItem(bool boolValue, const char* pszNote) = 0; + virtual ISECS2Item* addI8Item(long long value, const char* pszNote) = 0; + virtual ISECS2Item* addI4Item(int value, const char* pszNote) = 0; + virtual ISECS2Item* addI2Item(short value, const char* pszNote) = 0; + virtual ISECS2Item* addI1Item(char value, const char* pszNote) = 0; + virtual ISECS2Item* addF8Item(double value, const char* pszNote) = 0; + virtual ISECS2Item* addF4Item(float value, const char* pszNote) = 0; + virtual ISECS2Item* addU8Item(unsigned long long value, const char* pszNote) = 0; virtual ISECS2Item* addU4Item(unsigned int value, const char* pszNote) = 0; - virtual void setBinary(BYTE bin, const char* pszNote) = 0; + virtual ISECS2Item* addU2Item(unsigned short value, const char* pszNote) = 0; + virtual ISECS2Item* addU1Item(unsigned char value, const char* pszNote) = 0; + virtual void setBinary(const char* pszData, unsigned int len, const char* pszNote) = 0; + virtual void setString(const char* pszText, const char* pszNote) = 0; + virtual void setU1(unsigned char value, const char* pszNote) = 0; + virtual void setBool(bool value, const char* pszNote) = 0; virtual ISECS2Item* addItem() = 0; }; -- Gitblit v1.9.3