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

FIX: Coverity scan fixes, hard to keep track of stringlengths while reading and copying in C.

Browse Source
This commit is contained in:
iceman1001
2016-02-17 10:46:08 +01:00
parent 82885445b3
commit aacb96d7ed
6 changed files with 60 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
client/proxmark3.c
View File

@@ -127,8 +127,8 @@ static void *main_loop(void *targ) {
while(1) {
// If there is a script file
if (script_file)
{
if (script_file) {
if (!fgets(script_cmd_buf, sizeof(script_cmd_buf), script_file)) {
fclose(script_file);
script_file = NULL;
@@ -142,9 +142,10 @@ static void *main_loop(void *targ) {
if (nl)
*nl = '\0';
if ((cmd = (char*) malloc(strlen(script_cmd_buf) + 1)) != NULL) {
memset(cmd, 0, strlen(script_cmd_buf));
int newlen = strlen(script_cmd_buf);
if ((cmd = (char*) malloc( newlen + 1)) != NULL) {
memset(cmd, 0x00, newlen);
strcpy(cmd, script_cmd_buf);
printf("%s\n", cmd);
}
@@ -170,8 +171,14 @@ static void *main_loop(void *targ) {
printf("\n");
break;
}
free(cmd);
}
if (script_file) {
fclose(script_file);
script_file = NULL;
}
write_history(".history");
free(cmd);
@@ -181,11 +188,6 @@ static void *main_loop(void *targ) {
pthread_join(reader_thread, NULL);
}
if (script_file) {
fclose(script_file);
script_file = NULL;
}
ExitGraphics();
pthread_exit(NULL);
return NULL;