From c0d61ea38a684301c6937d8d4067765abdc5aaaa Mon Sep 17 00:00:00 2001
From: Maximilien Siavelis <m@siav.pw>
Date: ćšć, 08 8æ 2019 02:47:00 +0800
Subject: [PATCH] Merge pull request #26 from emgstabilis/25-generation-of-pc-identifier-fails-with-default-strategy-if-no-disk
---
src/library/pc-identifiers.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/library/pc-identifiers.c b/src/library/pc-identifiers.c
index 2a57eaa..d4119dd 100644
--- a/src/library/pc-identifiers.c
+++ b/src/library/pc-identifiers.c
@@ -39,11 +39,11 @@
if (identifiers == NULL || *num_identifiers == 0) {
result_adapterInfos = getAdapterInfos(NULL, &adapter_num);
- if (result_adapterInfos != FUNC_RET_OK) {
+ if ((result_adapterInfos != FUNC_RET_OK) || (adapter_num == 0)) {
return generate_disk_pc_id(identifiers, num_identifiers, false);
}
result_diskinfos = getDiskInfos(NULL, &disk_num);
- if (result_diskinfos != FUNC_RET_OK) {
+ if ((result_diskinfos != FUNC_RET_OK) || (disk_num == 0)) {
return generate_ethernet_pc_id(identifiers, num_identifiers, true);
}
*num_identifiers = disk_num * adapter_num;
@@ -179,7 +179,7 @@
if (use_label) {
if (diskInfos[i].label[0] != 0) {
memset(identifiers[j], 0, sizeof(PcIdentifier)); //!!!!!!!
- strncpy(identifiers[j], diskInfos[i].label,
+ strncpy((char*)identifiers[j], diskInfos[i].label,
sizeof(PcIdentifier));
j++;
}
--
Gitblit v1.9.1