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/CRecipeList.h | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/SourceCode/Bond/Servo/CRecipeList.h b/SourceCode/Bond/Servo/CRecipeList.h index 7cb4577..6b1ac0d 100644 --- a/SourceCode/Bond/Servo/CRecipeList.h +++ b/SourceCode/Bond/Servo/CRecipeList.h @@ -1,4 +1,4 @@ -#pragma once +锘�#pragma once #include <map> @@ -12,16 +12,28 @@ public: int getUnitNo(); - int addRecipePacket(int totalGroup, int currentGroup, const char* pszData, size_t size); + int addRecipePacket(int totalCount,int totalGroup, int currentGroup, const char* pszData, size_t size); int addRecipe(int index, short id); std::map<int, short>& getIds(); + std::unordered_map<short, std::vector<uint8_t>>& getParamsRawData(); void reset(); + void reset2(); + + // 娣诲姞鍙傛暟鍖� + int addParamsPacket(int totalCount, int totalGroup, int currentGroup, + short unitId, short recipeId, + const char* pszData, size_t size); + + // 猸� 鏂板搴忓垪鍖栧拰鍙嶅簭鍒楀寲鍑芥暟 + bool serialize(const std::string& filename) const; + bool deserialize(const std::string& filename); private: int m_nUnitNo; int m_nToatlGroupCount; int m_nCurrentGroupCount; std::map<int, short> m_ids; + std::unordered_map<short, std::vector<uint8_t>> m_paramsRawData; }; } -- Gitblit v1.9.3