From 683e25de59b6b7307a9654b17a4c784e8897d33a Mon Sep 17 00:00:00 2001
From: Jan Willamowius <jan@willamowius.de>
Date: 周日, 21 4月 2019 23:58:07 +0800
Subject: [PATCH] fix memory leaks on error
---
src/library/pc-identifiers.c | 237 +++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 142 insertions(+), 95 deletions(-)
diff --git a/src/library/pc-identifiers.c b/src/library/pc-identifiers.c
index 0eb08e0..2a57eaa 100644
--- a/src/library/pc-identifiers.c
+++ b/src/library/pc-identifiers.c
@@ -2,108 +2,149 @@
* pc-identifiers.c
*
* Created on: Apr 16, 2014
- * Author: devel
+ *
*/
#include "os/os.h"
#include "pc-identifiers.h"
#include <stdlib.h>
#include <string.h>
-#include <stdbool.h>
+#include <stdio.h>
#include "base/base64.h"
+#include "base/base.h"
#ifdef __linux__
+#include <stdbool.h>
#include <valgrind/memcheck.h>
+#else
+#ifdef __MINGW32__
+#include <windows.h>
+#else
+#include <Windows.h>
#endif
+#endif
+
+static FUNCTION_RETURN generate_disk_pc_id(PcIdentifier * identifiers,
+ unsigned int * num_identifiers, bool use_label);
+
+static FUNCTION_RETURN generate_ethernet_pc_id(PcIdentifier * identifiers,
+ unsigned int * num_identifiers, int use_mac);
static FUNCTION_RETURN generate_default_pc_id(PcIdentifier * identifiers,
unsigned int * num_identifiers) {
size_t adapter_num, disk_num;
- FUNCTION_RETURN result_adapterInfos, result_diskinfos;
- unsigned int required_id_size, i, j, k;
- DiskInfo * diskInfos;
- AdapterInfo *adapterInfos;
+ FUNCTION_RETURN result_adapterInfos, result_diskinfos, function_return;
+ unsigned int caller_identifiers, i, j, k, array_index;
+ DiskInfo * diskInfoPtr;
+ OsAdapterInfo *adapterInfoPtr;
- result_adapterInfos = getAdapterInfos(NULL, &adapter_num);
- if (result_adapterInfos != FUNC_RET_OK) {
- //call generate_disk_pc_id;
- return result_adapterInfos;
- }
- result_diskinfos = getDiskInfos(NULL, &disk_num);
- if (result_diskinfos == FUNC_RET_OK) {
- required_id_size = disk_num * adapter_num;
- } else {
- required_id_size = disk_num;
- }
- int defined_identifiers = *num_identifiers;
- *num_identifiers = required_id_size;
- if (identifiers == NULL) {
- return FUNC_RET_OK;
- } else if (required_id_size > defined_identifiers) {
- return FUNC_RET_BUFFER_TOO_SMALL;
- }
- diskInfos = (DiskInfo*) malloc(disk_num * sizeof(DiskInfo));
- result_diskinfos = getDiskInfos(diskInfos, &disk_num);
- adapterInfos = (AdapterInfo*) malloc(adapter_num * sizeof(AdapterInfo));
- result_adapterInfos = getAdapterInfos(adapterInfos, &adapter_num);
- for (i = 0; i < disk_num; i++) {
- for (j = 0; j < adapter_num; j++) {
- for (k = 0; k < 6; k++)
- identifiers[i * adapter_num + j][k] =
- diskInfos[i].disk_sn[k + 2]
- ^ adapterInfos[j].mac_address[k + 2];
+ if (identifiers == NULL || *num_identifiers == 0) {
+ result_adapterInfos = getAdapterInfos(NULL, &adapter_num);
+ if (result_adapterInfos != FUNC_RET_OK) {
+ return generate_disk_pc_id(identifiers, num_identifiers, false);
}
- }
+ result_diskinfos = getDiskInfos(NULL, &disk_num);
+ if (result_diskinfos != FUNC_RET_OK) {
+ return generate_ethernet_pc_id(identifiers, num_identifiers, true);
+ }
+ *num_identifiers = disk_num * adapter_num;
+ function_return = FUNC_RET_OK;
+ } else {
+ adapterInfoPtr = (OsAdapterInfo*) malloc(
+ (*num_identifiers) * sizeof(OsAdapterInfo));
+ adapter_num = *num_identifiers;
+ result_adapterInfos = getAdapterInfos(adapterInfoPtr, &adapter_num);
+ if (result_adapterInfos != FUNC_RET_OK
+ && result_adapterInfos != FUNC_RET_BUFFER_TOO_SMALL) {
+ free(adapterInfoPtr);
+ return generate_disk_pc_id(identifiers, num_identifiers, false);
+ }
+ diskInfoPtr = (DiskInfo*) malloc((*num_identifiers) * sizeof(DiskInfo));
+ disk_num = *num_identifiers;
+ result_diskinfos = getDiskInfos(diskInfoPtr, &disk_num);
+ if (result_diskinfos != FUNC_RET_OK
+ && result_diskinfos != FUNC_RET_BUFFER_TOO_SMALL) {
+ free(diskInfoPtr);
+ free(adapterInfoPtr);
+ return generate_ethernet_pc_id(identifiers, num_identifiers, true);
+ }
+ function_return = FUNC_RET_OK;
- free(diskInfos);
- free(adapterInfos);
- return FUNC_RET_OK;
+ caller_identifiers = *num_identifiers;
+ for (i = 0; i < disk_num; i++) {
+ for (j = 0; j < adapter_num; j++) {
+ array_index = i * adapter_num + j;
+ if (array_index >= caller_identifiers) {
+ function_return = FUNC_RET_BUFFER_TOO_SMALL;
+ //sweet memories...
+ goto end;
+ }
+ for (k = 0; k < 6; k++)
+ identifiers[array_index][k] = diskInfoPtr[i].disk_sn[k + 2]
+ ^ adapterInfoPtr[j].mac_address[k + 2];
+ }
+ }
+end:
+#ifdef _MSC_VER
+ *num_identifiers = min(*num_identifiers, adapter_num * disk_num);
+#else
+ *num_identifiers = cmin(*num_identifiers, adapter_num * disk_num);
+#endif
+ free(diskInfoPtr);
+ free(adapterInfoPtr);
+ }
+ return function_return;
}
static FUNCTION_RETURN generate_ethernet_pc_id(PcIdentifier * identifiers,
- unsigned int * num_identifiers, bool use_mac) {
- size_t adapters;
+ unsigned int * num_identifiers, int use_mac) {
FUNCTION_RETURN result_adapterInfos;
- unsigned int i, j, k;
- AdapterInfo *adapterInfos;
+ unsigned int j, k;
+ OsAdapterInfo *adapterInfos;
+ size_t defined_adapters, adapters = 0;
- result_adapterInfos = getAdapterInfos(NULL, &adapters);
- if (result_adapterInfos != FUNC_RET_OK) {
- return result_adapterInfos;
- }
-
- int defined_adapters = *num_identifiers;
- *num_identifiers = adapters;
- if (identifiers == NULL) {
- return FUNC_RET_OK;
- } else if (adapters > defined_adapters) {
- return FUNC_RET_BUFFER_TOO_SMALL;
- }
-
- adapterInfos = (AdapterInfo*) malloc(adapters * sizeof(AdapterInfo));
- result_adapterInfos = getAdapterInfos(adapterInfos, &adapters);
- for (j = 0; j < adapters; j++) {
- for (k = 0; k < 6; k++)
- if (use_mac) {
- identifiers[j][k] = adapterInfos[j].mac_address[k + 2];
- } else {
- //use ip
- if (k < 4) {
- identifiers[j][k] = adapterInfos[j].ipv4_address[k];
- } else {
- //padding
- identifiers[j][k] = 42;
- }
+ if (identifiers == NULL || *num_identifiers == 0) {
+ result_adapterInfos = getAdapterInfos(NULL, &adapters);
+ if (result_adapterInfos == FUNC_RET_OK
+ || result_adapterInfos == FUNC_RET_BUFFER_TOO_SMALL) {
+ *num_identifiers = adapters;
+ result_adapterInfos = FUNC_RET_OK;
+ }
+ } else {
+ defined_adapters = adapters = *num_identifiers;
+ adapterInfos = (OsAdapterInfo*) malloc(
+ adapters * sizeof(OsAdapterInfo));
+ result_adapterInfos = getAdapterInfos(adapterInfos, &adapters);
+ if (result_adapterInfos == FUNC_RET_BUFFER_TOO_SMALL
+ || result_adapterInfos == FUNC_RET_OK) {
+ for (j = 0; j < adapters; j++) {
+ for (k = 0; k < 6; k++)
+ if (use_mac) {
+ identifiers[j][k] = adapterInfos[j].mac_address[k + 2];
+ } else {
+ //use ip
+ if (k < 4) {
+ identifiers[j][k] = adapterInfos[j].ipv4_address[k];
+ } else {
+ //padding
+ identifiers[j][k] = 42;
+ }
+ }
}
+ result_adapterInfos = (
+ adapters > defined_adapters ?
+ FUNC_RET_BUFFER_TOO_SMALL : FUNC_RET_OK);
+ }
+ free(adapterInfos);
}
- free(adapterInfos);
- return FUNC_RET_OK;
+ return result_adapterInfos;
}
static FUNCTION_RETURN generate_disk_pc_id(PcIdentifier * identifiers,
unsigned int * num_identifiers, bool use_label) {
- size_t disk_num, available_disk_info=0;
+ size_t disk_num, available_disk_info = 0;
FUNCTION_RETURN result_diskinfos;
- unsigned int i, k, j;
+ unsigned int i, j;
+ int defined_identifiers;
char firstChar;
DiskInfo * diskInfos;
@@ -112,7 +153,7 @@
return result_diskinfos;
}
diskInfos = (DiskInfo*) malloc(disk_num * sizeof(DiskInfo));
- //memset(diskInfos,0,disk_num * sizeof(DiskInfo));
+ memset(diskInfos,0,disk_num * sizeof(DiskInfo));
result_diskinfos = getDiskInfos(diskInfos, &disk_num);
if (result_diskinfos != FUNC_RET_OK) {
free(diskInfos);
@@ -123,7 +164,7 @@
available_disk_info += firstChar == 0 ? 0 : 1;
}
- int defined_identifiers = *num_identifiers;
+ defined_identifiers = *num_identifiers;
*num_identifiers = available_disk_info;
if (identifiers == NULL) {
free(diskInfos);
@@ -133,17 +174,19 @@
return FUNC_RET_BUFFER_TOO_SMALL;
}
- j=0;
+ j = 0;
for (i = 0; i < disk_num; i++) {
- if(use_label){
- if(diskInfos[i].label[0]!=0){
- memset(identifiers[j],0,sizeof(PcIdentifier)); //!!!!!!!
- strncpy(identifiers[j],diskInfos[i].label,sizeof(PcIdentifier));
+ if (use_label) {
+ if (diskInfos[i].label[0] != 0) {
+ memset(identifiers[j], 0, sizeof(PcIdentifier)); //!!!!!!!
+ strncpy(identifiers[j], diskInfos[i].label,
+ sizeof(PcIdentifier));
j++;
}
- }else{
- if(diskInfos[i].disk_sn[0]!=0){
- memcpy(identifiers[j],&diskInfos[i].disk_sn[2],sizeof(PcIdentifier));
+ } else {
+ if (diskInfos[i].disk_sn[0] != 0) {
+ memcpy(identifiers[j], &diskInfos[i].disk_sn[2],
+ sizeof(PcIdentifier));
j++;
}
}
@@ -167,6 +210,7 @@
* @param
* @return
*/
+
FUNCTION_RETURN generate_pc_id(PcIdentifier * identifiers,
unsigned int * array_size, IDENTIFICATION_STRATEGY strategy) {
FUNCTION_RETURN result;
@@ -235,21 +279,22 @@
FUNCTION_RETURN encode_pc_id(PcIdentifier identifier1, PcIdentifier identifier2,
PcSignature pc_identifier_out) {
-//TODO base62 encoding, now uses base64
+ //TODO base62 encoding, now uses base64
PcIdentifier concat_identifiers[2];
+ char* b64_data = NULL;
int b64_size = 0;
size_t concatIdentifiersSize = sizeof(PcIdentifier) * 2;
-//concat_identifiers = (PcIdentifier *) malloc(concatIdentifiersSize);
+ //concat_identifiers = (PcIdentifier *) malloc(concatIdentifiersSize);
memcpy(&concat_identifiers[0], identifier1, sizeof(PcIdentifier));
memcpy(&concat_identifiers[1], identifier2, sizeof(PcIdentifier));
- char* b64_data = base64(concat_identifiers, concatIdentifiersSize,
- &b64_size);
+ b64_data = base64(concat_identifiers, concatIdentifiersSize, &b64_size);
if (b64_size > sizeof(PcSignature)) {
+ free(b64_data);
return FUNC_RET_BUFFER_TOO_SMALL;
}
sprintf(pc_identifier_out, "%.4s-%.4s-%.4s-%.4s", &b64_data[0],
&b64_data[4], &b64_data[8], &b64_data[12]);
-//free(concat_identifiers);
+ //free(concat_identifiers);
free(b64_data);
return FUNC_RET_OK;
}
@@ -299,9 +344,9 @@
*/
static FUNCTION_RETURN decode_pc_id(PcIdentifier identifier1_out,
PcIdentifier identifier2_out, PcSignature pc_signature_in) {
-//TODO base62 encoding, now uses base64
+ //TODO base62 encoding, now uses base64
- unsigned char * concat_identifiers;
+ unsigned char * concat_identifiers = NULL;
char base64ids[17];
int identifiers_size;
@@ -309,6 +354,7 @@
&base64ids[8], &base64ids[12]);
concat_identifiers = unbase64(base64ids, 16, &identifiers_size);
if (identifiers_size > sizeof(PcIdentifier) * 2) {
+ free(concat_identifiers);
return FUNC_RET_BUFFER_TOO_SMALL;
}
memcpy(identifier1_out, concat_identifiers, sizeof(PcIdentifier));
@@ -329,7 +375,7 @@
PcIdentifier* calculated_identifiers = NULL;
unsigned int calc_identifiers_size = 0;
int i = 0, j = 0;
-//bool found;
+ //bool found;
#ifdef _DEBUG
printf("Comparing pc identifiers: \n");
#endif
@@ -338,10 +384,11 @@
return result;
}
previous_strategy_id = STRATEGY_UNKNOWN;
-//found = false;
+ //found = false;
for (i = 0; i < 2; i++) {
current_strategy_id = strategy_from_pc_id(user_identifiers[i]);
if (current_strategy_id == STRATEGY_UNKNOWN) {
+ free(calculated_identifiers);
return LICENSE_MALFORMED;
}
if (current_strategy_id != previous_strategy_id) {
@@ -359,9 +406,9 @@
for (j = 0; j < calc_identifiers_size; j++) {
#ifdef _DEBUG
printf("generated id: %02x%02x%02x%02x%02x%02x index %d, user_supplied id %02x%02x%02x%02x%02x%02x idx: %d\n",
- calculated_identifiers[j][0],calculated_identifiers[j][1],calculated_identifiers[j][2],
- calculated_identifiers[j][3],calculated_identifiers[j][4],calculated_identifiers[j][5],j,
- user_identifiers[i][0],user_identifiers[i][1],user_identifiers[i][2],user_identifiers[i][3],user_identifiers[i][4],user_identifiers[i][5],i);
+ calculated_identifiers[j][0], calculated_identifiers[j][1], calculated_identifiers[j][2],
+ calculated_identifiers[j][3], calculated_identifiers[j][4], calculated_identifiers[j][5], j,
+ user_identifiers[i][0], user_identifiers[i][1], user_identifiers[i][2], user_identifiers[i][3], user_identifiers[i][4], user_identifiers[i][5], i);
#endif
if (!memcmp(user_identifiers[i], calculated_identifiers[j],
--
Gitblit v1.9.1