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/BEQLibrary/Unit.cpp | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/BEQLibrary/Unit.cpp b/SourceCode/Bond/BEQLibrary/Unit.cpp
index df10698..a5e49e2 100644
--- a/SourceCode/Bond/BEQLibrary/Unit.cpp
+++ b/SourceCode/Bond/BEQLibrary/Unit.cpp
@@ -62,6 +62,7 @@
m_listener.onRemoveAlarm = listener.onRemoveAlarm;
m_listener.onStepChanged = listener.onStepChanged;
m_listener.onDataChanged = listener.onDataChanged;
+ m_listener.onReqNotReady = listener.onReqNotReady;
m_listener.onReqLoad = listener.onReqLoad;
m_listener.onReqUnload = listener.onReqUnload;
}
@@ -212,6 +213,22 @@
return m_strAlarmText;
}
+ int CUnit::reqNotReady(int layer)
+ {
+ ASSERT(m_listener.onReqNotReady);
+ if (layer <= 0) return -1;
+ if (layer > m_nLayerCount) return -2;
+
+ // 状态改变才回调到上层
+ if (m_nLayerLoadState[layer - 1] != LAYER_NOT_READY) {
+ m_nLayerLoadState[layer - 1] = LAYER_NOT_READY;
+ m_listener.onReqNotReady(this, layer);
+ return 0;
+ }
+
+ return -3;
+ }
+
int CUnit::reqLoad(int layer)
{
ASSERT(m_listener.onReqLoad);
--
Gitblit v1.9.3