From 1c080b5ca821ef6e1d40025289195b18fa2973b5 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期一, 26 一月 2026 22:46:48 +0800
Subject: [PATCH] 1.把 m_bufGlass 的释放提前到 CMaster::term()，确保在 m_glassPool.term() 之前完成，避免析构时再触碰已被回收的 Glass。析构里仍保留原逻辑，若 term() 已清空则不会重复释放。

---
 SourceCode/Bond/Servo/CJobDataS.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/SourceCode/Bond/Servo/CJobDataS.cpp b/SourceCode/Bond/Servo/CJobDataS.cpp
index 9f5985b..2231b0b 100644
--- a/SourceCode/Bond/Servo/CJobDataS.cpp
+++ b/SourceCode/Bond/Servo/CJobDataS.cpp
@@ -618,9 +618,9 @@
 		index += sizeof(short);
 
 		memcpy(&m_nQTime[1], &pszBuffer[index], sizeof(short));
-		index += sizeof(int);
+		index += sizeof(short);
 
-		memcpy(&m_nQTime[2], &pszBuffer[index], sizeof(int));
+		memcpy(&m_nQTime[2], &pszBuffer[index], sizeof(short));
 		index += sizeof(short);
 
 		memcpy(&m_nQTimeOverFlag, &pszBuffer[index], sizeof(short));

--
Gitblit v1.9.3