From 829fe6c6bc33d53fda9c31fd45a37e1df87befff Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 30 一月 2026 11:16:24 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CSVData.cpp | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/SourceCode/Bond/Servo/CSVData.cpp b/SourceCode/Bond/Servo/CSVData.cpp
index 22ee583..a60a7f6 100644
--- a/SourceCode/Bond/Servo/CSVData.cpp
+++ b/SourceCode/Bond/Servo/CSVData.cpp
@@ -26,31 +26,35 @@
int CSVData::serialize(char* pszBuffer, int nBufferSize)
{
- if (nBufferSize < 133) return -1;
+ if (nBufferSize < 133 * 2) return -1;
int index = 0;
- CToolUnits::convertString(&pszBuffer[index], 8, m_strTime);
- index += 8;
+ CToolUnits::convertString(&pszBuffer[index], 8 * 2, m_strTime);
+ index += 8 * 2;
- memcpy(&pszBuffer[index], m_svRawData.data(), 125);
- index += 125;
+ memcpy(&pszBuffer[index], m_svRawData.data(), 125 * 2);
+ index += 125 * 2;
- return 133;
+ return 133 * 2;
}
int CSVData::unserialize(const char* pszBuffer, int nBufferSize)
{
- if (nBufferSize < 133) return -1;
+ if (pszBuffer == nullptr) return -1;
+ if (nBufferSize < 133 * 2) return -1;
int index = 0;
- CSVData svData;
- CToolUnits::convertString(&pszBuffer[index], 8, m_strTime);
- index += 8;
+ CToolUnits::convertString(&pszBuffer[index], 8 * 2, m_strTime);
+ index += 8 * 2;
m_svRawData.clear();
- m_svRawData.insert(m_svRawData.end(), (uint8_t*)(pszBuffer), (uint8_t*)(pszBuffer)+125);
- index += 125;
+ if (nBufferSize < index + 125 * 2) return -1;
+ m_svRawData.insert(
+ m_svRawData.end(),
+ (const uint8_t*)&pszBuffer[index],
+ (const uint8_t*)&pszBuffer[index + 125 * 2]);
+ index += 125 * 2;
- return 133;
+ return 133 * 2;
}
}
--
Gitblit v1.9.3