Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix unnecessary localtime tm struct free call and cleanup #7

Merged
merged 1 commit into from
Aug 19, 2024
Merged

Fix unnecessary localtime tm struct free call and cleanup #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 10 additions & 18 deletions c/wsgup/src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ int main(char* argc, char** argv){
// register is a keyword in C. So we append a "_json" suffix.
char* register_json = read_file("../../shared/register.json");
if(register_json == NULL){
return -1; //goto end;
return -1;
}

//puts(register_json);
Expand All @@ -31,7 +31,7 @@ int main(char* argc, char** argv){
// Read test data from file
char* test_data_json = read_file("../../shared/testdata.json");
if(test_data_json == NULL){
return -1; //goto end;
return -1;
}
//puts(test_data_json);

Expand Down Expand Up @@ -75,7 +75,7 @@ int main(char* argc, char** argv){
size_t bytes = strftime(date_dec, 5, "%e%m", today);
if(bytes == 0){
fprintf(stderr, "date_dec buffer too small.\n");
return -1; //goto end;
return -1;
}
// atoi skips leading spaces (if day is less than 10)
sprintf(date_hex, "%x", atoi(date_dec));
Expand Down Expand Up @@ -170,21 +170,13 @@ int main(char* argc, char** argv){

int status = (userid_length == 0 || password_length == 0);

end:
free(password);
free(userid);
if(key != NULL)
free(key); // malloc by hex_decode
if(today != NULL)
free(today); // malloc by localtime
if(res != NULL)
cJSON_Delete(res); // malloc by cJSON_Parse
if(registration != NULL)
cJSON_Delete(registration); // malloc by cJSON_Parse
if(test_data_json != NULL)
free(test_data_json); // malloc by read_file
if(register_json != NULL)
free(register_json); // malloc by read_file
free(password); // calloc by main
free(userid); // calloc by main
free(key); // malloc by hex_decode
cJSON_Delete(res); // malloc by cJSON_Parse
cJSON_Delete(registration); // malloc by cJSON_Parse
free(test_data_json); // malloc by read_file
free(register_json); // malloc by read_file

return status;
}
Expand Down