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/Servo.vcxproj | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/Servo.vcxproj b/SourceCode/Bond/Servo/Servo.vcxproj
index f3e94f1..f1eff4a 100644
--- a/SourceCode/Bond/Servo/Servo.vcxproj
+++ b/SourceCode/Bond/Servo/Servo.vcxproj
@@ -222,6 +222,8 @@
<ClInclude Include="..\jsoncpp\include\json\value.h" />
<ClInclude Include="..\jsoncpp\include\json\writer.h" />
<ClInclude Include="..\jsoncpp\lib_json\json_batchallocator.h" />
+ <ClInclude Include="AccordionWnd.h" />
+ <ClInclude Include="AlarmPopupDlg.h" />
<ClInclude Include="CBaseDlg.h" />
<ClInclude Include="CCarrierSlotGrid.h" />
<ClInclude Include="CCarrierSlotSelector.h" />
@@ -233,6 +235,7 @@
<ClInclude Include="CControlJobManagerDlg.h" />
<ClInclude Include="CCustomCheckBox.h" />
<ClInclude Include="CCollectionEvent.h" />
+ <ClInclude Include="CEventEditDlg.h" />
<ClInclude Include="CEquipmentPage3.h" />
<ClInclude Include="CExpandableListCtrl.h" />
<ClInclude Include="CGlassPool.h" />
@@ -240,14 +243,21 @@
<ClInclude Include="ClientListDlg.h" />
<ClInclude Include="CMyStatusbar.h" />
<ClInclude Include="CPageCollectionEvent.h" />
+ <ClInclude Include="CPageCtrlState.h" />
<ClInclude Include="CPageGlassList.h" />
<ClInclude Include="CPageLinkSignal.h" />
+ <ClInclude Include="CPageProdOverview.h" />
<ClInclude Include="CPageReport.h" />
<ClInclude Include="CPageVarialbles.h" />
+ <ClInclude Include="CPageDataVarialbles.h" />
+ <ClInclude Include="CPanelProduction.h" />
+ <ClInclude Include="HmLabel.h" />
+ <ClInclude Include="ProductionStats.h" />
<ClInclude Include="CParam.h" />
<ClInclude Include="CCjPage1.h" />
<ClInclude Include="CProcessDataListDlg.h" />
<ClInclude Include="CReport.h" />
+ <ClInclude Include="CReportEditDlg.h" />
<ClInclude Include="CRobotCmdContainerDlg.h" />
<ClInclude Include="CRobotCmdTestDlg.h" />
<ClInclude Include="CPagePortStatus.h" />
@@ -258,7 +268,9 @@
<ClInclude Include="CUserManager2.h" />
<ClInclude Include="CUserManager2Dlg.h" />
<ClInclude Include="CUserEdit2Dlg.h" />
+ <ClInclude Include="CUserXLogDlg.h" />
<ClInclude Include="CVariable.h" />
+ <ClInclude Include="CVariableEditDlg2.h" />
<ClInclude Include="DeviceRecipeParamDlg.h" />
<ClInclude Include="GlassJson.h" />
<ClInclude Include="GlassLogDb.h" />
@@ -439,6 +451,8 @@
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
</ClCompile>
+ <ClCompile Include="AccordionWnd.cpp" />
+ <ClCompile Include="AlarmPopupDlg.cpp" />
<ClCompile Include="CBaseDlg.cpp" />
<ClCompile Include="CCarrierSlotGrid.cpp" />
<ClCompile Include="CCarrierSlotSelector.cpp" />
@@ -450,6 +464,7 @@
<ClCompile Include="CControlJobManagerDlg.cpp" />
<ClCompile Include="CCustomCheckBox.cpp" />
<ClCompile Include="CCollectionEvent.cpp" />
+ <ClCompile Include="CEventEditDlg.cpp" />
<ClCompile Include="CEquipmentPage3.cpp" />
<ClCompile Include="CExpandableListCtrl.cpp" />
<ClCompile Include="CGlassPool.cpp" />
@@ -457,14 +472,22 @@
<ClCompile Include="ClientListDlg.cpp" />
<ClCompile Include="CMyStatusbar.cpp" />
<ClCompile Include="CPageCollectionEvent.cpp" />
+ <ClCompile Include="CPageCtrlState.cpp" />
<ClCompile Include="CPageGlassList.cpp" />
<ClCompile Include="CPageLinkSignal.cpp" />
+ <ClCompile Include="CPageProdOverview.cpp" />
<ClCompile Include="CPageReport.cpp" />
<ClCompile Include="CPageVarialbles.cpp" />
+ <ClCompile Include="CPageDataVarialbles.cpp" />
+ <ClCompile Include="ConfigurationProduction.cpp" />
+ <ClCompile Include="CPanelProduction.cpp" />
+ <ClCompile Include="HmLabel.cpp" />
+ <ClCompile Include="ProductionStats.cpp" />
<ClCompile Include="CParam.cpp" />
<ClCompile Include="CCjPage1.cpp" />
<ClCompile Include="CProcessDataListDlg.cpp" />
<ClCompile Include="CReport.cpp" />
+ <ClCompile Include="CReportEditDlg.cpp" />
<ClCompile Include="CRobotCmdContainerDlg.cpp" />
<ClCompile Include="CRobotCmdTestDlg.cpp" />
<ClCompile Include="CPagePortStatus.cpp" />
@@ -475,7 +498,9 @@
<ClCompile Include="CUserManager2.cpp" />
<ClCompile Include="CUserManager2Dlg.cpp" />
<ClCompile Include="CUserEdit2Dlg.cpp" />
+ <ClCompile Include="CUserXLogDlg.cpp" />
<ClCompile Include="CVariable.cpp" />
+ <ClCompile Include="CVariableEditDlg2.cpp" />
<ClCompile Include="DeviceRecipeParamDlg.cpp" />
<ClCompile Include="GlassJson.cpp" />
<ClCompile Include="GlassLogDb.cpp" />
--
Gitblit v1.9.3