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/CJobDataB.h | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/SourceCode/Bond/Servo/CJobDataB.h b/SourceCode/Bond/Servo/CJobDataB.h
index 3644ad9..b609376 100644
--- a/SourceCode/Bond/Servo/CJobDataB.h
+++ b/SourceCode/Bond/Servo/CJobDataB.h
@@ -1,26 +1,33 @@
#pragma once
-#include <vector>
-#include <string>
+#define JOBDATAB_SIZE (14 * 2)
namespace SERVO {
class CJobDataB
{
public:
CJobDataB();
- ~CJobDataB();
+ CJobDataB::CJobDataB(CJobDataB&& other) noexcept;
+ virtual ~CJobDataB();
public:
+ void* getOwner();
+ void setOwner(void* pOwner);
+ void copy(CJobDataB* pScr);
+ int getCassetteSequenceNo();
+ void setCassetteSequenceNo(int no);
+ int getJobSequenceNo();
+ void setJobSequenceNo(int no);
+ std::string& getGlassId();
+ void setGlassId(const char* pszGlassId);
int serialize(char* pszBuffer, int nBufferSize);
+ int unserialize(const char* pszBuffer, int nBufferSize);
private:
- short m_nPortNo;
- std::string m_strCarrierId;
- std::string m_pruductId;
- short m_nCarrierState;
- int m_nSlotMapping;
- int m_nSlotSelectedFlag;
- std::vector<std::string> m_glassIds;
+ void* m_pOwner;
+ int m_nCassetteSequenceNo;
+ int m_nJobSequenceNo;
+ std::string m_strGlassId;
};
}
--
Gitblit v1.9.3