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/BondEq/CPanel.cpp | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/BondEq/CPanel.cpp b/SourceCode/Bond/BondEq/CPanel.cpp
index 188c5fa..b0afd5a 100644
--- a/SourceCode/Bond/BondEq/CPanel.cpp
+++ b/SourceCode/Bond/BondEq/CPanel.cpp
@@ -193,12 +193,12 @@
int CPanel::getBlodLen()
{
- return sizeof(UNITDATA1) * (4 + m_datas.size()) + PARAM_RAWDATA_SIZE;
+ return sizeof(UNITDATA1) * (4 + (int)m_datas.size()) + PARAM_RAWDATA_SIZE;
}
int CPanel::getBlod(char* pszBuffer, int nBufferSize)
{
- int size = sizeof(UNITDATA1) * (4 + m_datas.size()) + PARAM_RAWDATA_SIZE;
+ int size = sizeof(UNITDATA1) * (4 + (int)m_datas.size()) + PARAM_RAWDATA_SIZE;
if (nBufferSize < size)
return -1;
memcpy(pszBuffer, m_pszParamsRawData, PARAM_RAWDATA_SIZE);
@@ -634,7 +634,7 @@
addIntParam("A单元_下腔体冷却温度", "", v);
i += 2;
- addIntParam("A单元_压感压纸气囊压力设定值", "", (double)toFloat(&pszData[i]));
+ addDoubleParam("A单元_压感压纸气囊压力设定值", "", (double)toFloat(&pszData[i]));
i += 4;
v = (m_pszParamsRawData[i] & 0xff) | (m_pszParamsRawData[i + 1] & 0xff) << 8;
@@ -858,7 +858,7 @@
addIntParam("B单元_下腔体冷却温度", "", v);
i += 2;
- addIntParam("B单元_压感压纸气囊压力设定值", "", (double)toFloat(&pszData[i]));
+ addDoubleParam("B单元_压感压纸气囊压力设定值", "", (double)toFloat(&pszData[i]));
i += 4;
v = (m_pszParamsRawData[i] & 0xff) | (m_pszParamsRawData[i + 1] & 0xff) << 8;
--
Gitblit v1.9.3