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/CPanelAttributes.cpp | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/SourceCode/Bond/Servo/CPanelAttributes.cpp b/SourceCode/Bond/Servo/CPanelAttributes.cpp
index 75241c1..611ebac 100644
--- a/SourceCode/Bond/Servo/CPanelAttributes.cpp
+++ b/SourceCode/Bond/Servo/CPanelAttributes.cpp
@@ -59,6 +59,7 @@
SetDlgItemText(IDC_LABEL_TITLE, pStep->getName().c_str());
SERVO::CAttributeVector attrubutes;
pStep->getAttributeVector(attrubutes);
+ attrubutes.sortWithWeight();
unsigned int nSize = attrubutes.size();
for (unsigned int i = 0; i < nSize; i++) {
SERVO::CAttribute* pAttribute = attrubutes.getAttribute(i);
@@ -66,7 +67,7 @@
pAttribute->getName().c_str(),
pAttribute->getValue().c_str(),
pAttribute->getDescription().c_str());
- pProperty->AllowEdit(TRUE);
+ pProperty->AllowEdit(FALSE);
m_gridCtrl.AddProperty(pProperty);
}
}
@@ -137,7 +138,6 @@
void CPanelAttributes::OnSize(UINT nType, int cx, int cy)
{
CDialogEx::OnSize(nType, cx, cy);
- CDialogEx::OnSize(nType, cx, cy);
if (GetDlgItem(IDC_LINE1) == nullptr) return;
CWnd* pItem;
@@ -162,18 +162,18 @@
y += 8;
- GetDlgItem(IDC_MFCPROPERTYGRID1)->MoveWindow(5, y, rcClient.Width() - 13, rcClient.Height() - 3 - y);
+ GetDlgItem(IDC_MFCPROPERTYGRID1)->MoveWindow(5, y, rcClient.Width() - 8, rcClient.Height() - 3 - y);
}
-#define MASTER_PANEL_MIN_WIDTH 88
-#define MASTER_PANEL_MAX_WIDTH 588
+#define ATTRIBUTES_PANEL_MIN_WIDTH 88
+#define ATTRIBUTES_PANEL_MAX_WIDTH 588
void CPanelAttributes::OnVLineMoveX(NMHDR* nmhdr, LRESULT* result)
{
BYVERTICALLINE_NMHDR* pNmhdrex = (BYVERTICALLINE_NMHDR*)nmhdr;
int x = pNmhdrex->dwData;
m_nPanelWidth += x;
- m_nPanelWidth = max(m_nPanelWidth, MASTER_PANEL_MIN_WIDTH);
- m_nPanelWidth = min(m_nPanelWidth, MASTER_PANEL_MAX_WIDTH);
+ m_nPanelWidth = max(m_nPanelWidth, ATTRIBUTES_PANEL_MIN_WIDTH);
+ m_nPanelWidth = min(m_nPanelWidth, ATTRIBUTES_PANEL_MAX_WIDTH);
GetParent()->SendMessage(ID_MSG_PANEL_RESIZE, m_nPanelWidth, 0);
CString strIniFile, strValue;
--
Gitblit v1.9.3