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/CServoUtilsTool.h | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/CServoUtilsTool.h b/SourceCode/Bond/Servo/CServoUtilsTool.h
index 10d3038..06b167c 100644
--- a/SourceCode/Bond/Servo/CServoUtilsTool.h
+++ b/SourceCode/Bond/Servo/CServoUtilsTool.h
@@ -1,9 +1,16 @@
-#pragma once
+锘�#pragma once
#include "ServoCommo.h"
#include "CGlass.h"
namespace SERVO {
+ constexpr uint32_t MID_Bonder1 = 1001;
+ constexpr uint32_t MID_Bonder2 = 1002;
+ constexpr uint32_t MID_VacuumBakeA = 1003;
+ constexpr uint32_t MID_VacuumBakeB = 1004;
+ constexpr uint32_t MID_BakeCoolingA = 1005;
+ constexpr uint32_t MID_BakeCoolingB = 1006;
+
class CServoUtilsTool
{
public:
@@ -11,10 +18,13 @@
virtual ~CServoUtilsTool();
public:
+ static std::string getEqName(int eqid);
static std::string getEqUnitName(int eqid, int unit);
+ static std::string getEqUnitName(int eqid, int unit, int slot);
static std::string getMaterialsTypeText(MaterialsType type);
static std::string getGlassStateText(SERVO::GlsState state);
static std::string getInspResultText(SERVO::InspResult result);
+ static std::unordered_map<int, std::vector<std::string>>& getEqDataTypes();
};
}
--
Gitblit v1.9.3