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/CPageGlassList.h | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/SourceCode/Bond/Servo/CPageGlassList.h b/SourceCode/Bond/Servo/CPageGlassList.h index bb23485..38a35c7 100644 --- a/SourceCode/Bond/Servo/CPageGlassList.h +++ b/SourceCode/Bond/Servo/CPageGlassList.h @@ -1,6 +1,11 @@ 锘�#pragma once #include "CExpandableListCtrl.h" #include "GlassLogDb.h" +#include <unordered_map> + +// ====== 缂栬瘧寮�鍏宠鏄� ====== +// USE_MOCK_SENSOR_DATA: 1=鍚敤妯℃嫙浼犳劅鍣ㄦ暟鎹敓鎴愶紱0=浣跨敤鐪熷疄鏁版嵁 +// 鍦� CPageGlassList.cpp 涓畾涔� // CPageGlassList 瀵硅瘽妗� @@ -61,9 +66,11 @@ void ExportBasicInfo(CString& csvContent, const GlassLogDb::Row& row); void ExportProcessParams(CString& csvContent, const GlassLogDb::Row& row); void ExportSensorData(CString& csvContent, const GlassLogDb::Row& row); - static std::vector<std::string> getMachineColumnOrder(int machineId); + static std::vector<std::string> getMachineColumnOrder(int machineId, const std::unordered_map<std::string, std::vector<SERVO::SVDataItem>>* actualData = nullptr); static std::string timePointToString(const std::chrono::system_clock::time_point& tp); static int64_t timePointToMs(const std::chrono::system_clock::time_point& tp); + void GenerateMockSVData(SERVO::CGlass& glass); + double GenerateMockValue(int machineId, const std::string& dataType, int index); // 瀵硅瘽妗嗘暟鎹� #ifdef AFX_DESIGN_TIME -- Gitblit v1.9.3