dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added security features to the loadFileDICTIONARY_safe function (memset after a realloc).

Browse Source
This commit is contained in:
Matthias Konrath
2019-08-28 10:38:56 +02:00
parent 1ce10cfea6
commit 7eb79732ff
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
client/fileutils.c
View File

@@ -673,7 +673,7 @@ int loadFileDICTIONARY_safe(const char *preferredName, uint8_t **data, uint8_t k
char line[255]; char line[255];
// allocate some space for the dictionary // allocate some space for the dictionary
*data = (uint8_t*) malloc(keylen * allocation_size * sizeof(uint8_t)); *data = (uint8_t*) calloc(keylen * allocation_size, sizeof(uint8_t));
if (*data == NULL) return PM3_EFILE; if (*data == NULL) return PM3_EFILE;
FILE *f = fopen(path, "r"); FILE *f = fopen(path, "r");
@@ -688,7 +688,12 @@ int loadFileDICTIONARY_safe(const char *preferredName, uint8_t **data, uint8_t k
if ((*keycnt) >= allocation_size) { if ((*keycnt) >= allocation_size) {
allocation_size += block_size; allocation_size += block_size;
*data = (uint8_t*) realloc((void*) *data, keylen * allocation_size * sizeof(uint8_t)); *data = (uint8_t*) realloc((void*) *data, keylen * allocation_size * sizeof(uint8_t));
if (*data == NULL) return PM3_EFILE; if (*data == NULL) {
return PM3_EFILE;
} else {
// zero the new memeory (safety first)
memset(*data + counter, 0, block_size);
}
} }
// add null terminator // add null terminator