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/RecipeDeviceBindDlg.h | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/RecipeDeviceBindDlg.h b/SourceCode/Bond/Servo/RecipeDeviceBindDlg.h
index 884f048..d23b01d 100644
--- a/SourceCode/Bond/Servo/RecipeDeviceBindDlg.h
+++ b/SourceCode/Bond/Servo/RecipeDeviceBindDlg.h
@@ -1,6 +1,6 @@
锘�#pragma once
#include "afxdialogex.h"
-
+#include "RecipeManager.h"
// CRecipeDeviceBindDlg 瀵硅瘽妗�
@@ -12,6 +12,9 @@
CRecipeDeviceBindDlg(CWnd* pParent = nullptr); // 鏍囧噯鏋勯�犲嚱鏁�
virtual ~CRecipeDeviceBindDlg();
+ const RecipeInfo& GetRecipeInfo() const;
+ void SetRecipeInfo(const RecipeInfo& info);
+
// 瀵硅瘽妗嗘暟鎹�
#ifdef AFX_DESIGN_TIME
enum { IDD = IDD_DIALOG_RECIPE_DEVICE_BIND };
@@ -22,14 +25,24 @@
virtual BOOL OnInitDialog();
afx_msg void OnClose();
afx_msg void OnSize(UINT nType, int cx, int cy);
+ afx_msg void OnBnClickedOk();
DECLARE_MESSAGE_MAP()
private:
+ void ReleaseDeviceControls();
+ void CreateDeviceControls(int nXStart, int nYStart, int nTotalControlWidth, int nRowHeight);
+ bool FillDeviceInfo(int idx, int nDeviceID, const CString& strDeviceName, int nSelectedRecipeID = -1);
+ bool FillComboRecipeList(CComboBox* pCombo, int nDeviceID, int nSelectedRecipeID = -1);
+
struct DeviceWidget {
CEdit* editDeviceID;
CEdit* editDeviceName;
CComboBox* comboRecipeID;
};
+ CFont m_font;
+ CString m_strPPID;
+ CString m_strDesc;
+ RecipeInfo m_recipe;
std::vector<DeviceWidget> m_vecDevices;
};
--
Gitblit v1.9.3