From d4edbb5a0aae0211389ce86264809b4237c73769 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周日, 08 3月 2020 21:27:16 +0800
Subject: [PATCH] Issues #14 and #6
---
src/library/hw_identifier/disk_strategy.cpp | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/library/hw_identifier/disk_strategy.cpp b/src/library/hw_identifier/disk_strategy.cpp
index cec5da8..4fe212e 100644
--- a/src/library/hw_identifier/disk_strategy.cpp
+++ b/src/library/hw_identifier/disk_strategy.cpp
@@ -14,10 +14,10 @@
static FUNCTION_RETURN generate_disk_pc_id(vector<array<uint8_t, HW_IDENTIFIER_PROPRIETARY_DATA>> &v_disk_id,
bool use_id) {
- size_t disk_num, available_disk_info = 0;
+ size_t disk_num = 0;
+ size_t available_disk_info = 0;
FUNCTION_RETURN result_diskinfos;
unsigned int i;
- DiskInfo *diskInfos;
result_diskinfos = getDiskInfos(nullptr, &disk_num);
if (result_diskinfos != FUNC_RET_OK && result_diskinfos != FUNC_RET_BUFFER_TOO_SMALL) {
@@ -26,13 +26,14 @@
if (disk_num == 0) {
return FUNC_RET_NOT_AVAIL;
}
-
- diskInfos = (DiskInfo *)malloc(disk_num * sizeof(DiskInfo));
+ size_t mem = disk_num * sizeof(DiskInfo);
+ DiskInfo *diskInfos = (DiskInfo *)malloc(mem);
if (diskInfos == nullptr) {
return FUNC_RET_NOT_AVAIL;
}
- memset(diskInfos, 0, disk_num * sizeof(DiskInfo));
+ memset(diskInfos, 0, mem);
result_diskinfos = getDiskInfos(diskInfos, &disk_num);
+
if (result_diskinfos != FUNC_RET_OK) {
free(diskInfos);
return result_diskinfos;
@@ -46,17 +47,19 @@
return FUNC_RET_NOT_AVAIL;
}
v_disk_id.reserve(available_disk_info);
+ //FIXME use preferred drive.
for (i = 0; i < disk_num; i++) {
array<uint8_t, HW_IDENTIFIER_PROPRIETARY_DATA> a_disk_id;
+ a_disk_id.fill(0);
if (use_id) {
if (diskInfos[i].disk_sn[0] != 0) {
- memcpy(&a_disk_id[0], &diskInfos[i].disk_sn[2], a_disk_id.size());
+ size_t size = min(a_disk_id.size(), sizeof(&diskInfos[i].disk_sn));
+ memcpy(&a_disk_id[0], diskInfos[i].disk_sn, size);
v_disk_id.push_back(a_disk_id);
}
} else {
if (diskInfos[i].label[0] != 0) {
- a_disk_id.fill(0);
- strncpy((char *)&a_disk_id[0], diskInfos[i].label, a_disk_id.size());
+ strncpy((char *)&a_disk_id[0], diskInfos[i].label, a_disk_id.size()-1);
v_disk_id.push_back(a_disk_id);
}
}
--
Gitblit v1.9.1