RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-02-13 18:57:12 +08:00
Code Issues Projects Releases Packages Wiki Activity

calloc in fileutils

Browse source
This commit is contained in:
Philippe Teuwen 2019-08-24 07:15:21 +02:00
parent c6145a81c2
commit 7ab7d68a26
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
client/fileutils.c
View file

@ -669,7 +669,7 @@ int searchAndList(const char *pm3dir, const char *ext) {
char *searchFile(const char *pm3dir, const char *searchname) { char *searchFile(const char *pm3dir, const char *searchname) {
// explicit absolute (/) or relative path (./) => try only to match it directly // explicit absolute (/) or relative path (./) => try only to match it directly
char *filename = malloc(strlen(searchname) + 1); char *filename = calloc(strlen(searchname) + 1, sizeof(char));
if (filename == NULL) return NULL; if (filename == NULL) return NULL;
strcpy(filename, searchname); strcpy(filename, searchname);
if (((strlen(filename) > 1) && (filename[0] == '/')) || if (((strlen(filename) > 1) && (filename[0] == '/')) ||
@ -690,7 +690,7 @@ char *searchFile(const char *pm3dir, const char *searchname) {
// try pm3 dirs in current workdir (dev mode) // try pm3 dirs in current workdir (dev mode)
const char *exec_path = get_my_executable_directory(); const char *exec_path = get_my_executable_directory();
if (exec_path != NULL) { if (exec_path != NULL) {
char *path = malloc(strlen(exec_path) + strlen(pm3dir) + strlen(filename) + 1); char *path = calloc(strlen(exec_path) + strlen(pm3dir) + strlen(filename) + 1, sizeof(char));
if (path == NULL) if (path == NULL)
goto out; goto out;
strcpy(path, exec_path); strcpy(path, exec_path);
@ -706,7 +706,7 @@ char *searchFile(const char *pm3dir, const char *searchname) {
// try pm3 dirs in user .proxmark3 (user mode) // try pm3 dirs in user .proxmark3 (user mode)
char *user_path = getenv("HOME"); char *user_path = getenv("HOME");
if (user_path != NULL) { if (user_path != NULL) {
char *path = malloc(strlen(user_path) + strlen(PM3_USER_DIRECTORY) + strlen(pm3dir) + strlen(filename) + 1); char *path = calloc(strlen(user_path) + strlen(PM3_USER_DIRECTORY) + strlen(pm3dir) + strlen(filename) + 1, sizeof(char));
if (path == NULL) if (path == NULL)
goto out; goto out;
strcpy(path, user_path); strcpy(path, user_path);
@ -722,7 +722,7 @@ char *searchFile(const char *pm3dir, const char *searchname) {
} }
// try pm3 dirs in pm3 installation dir (install mode) // try pm3 dirs in pm3 installation dir (install mode)
{ {
char *path = malloc(strlen(PM3_SHARE_PATH) + strlen(pm3dir) + strlen(filename) + 1); char *path = calloc(strlen(PM3_SHARE_PATH) + strlen(pm3dir) + strlen(filename) + 1, sizeof(char));
if (path == NULL) if (path == NULL)
goto out; goto out;
strcpy(path, PM3_SHARE_PATH); strcpy(path, PM3_SHARE_PATH);