Skip to content

Fix buffer size issue in filter name generation #806

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

Open
ShangzhiXu wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −5
Open

Fix buffer size issue in filter name generation #806

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
10 changes: 5 additions & 5 deletions src/console/dlt-control-common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -897,8 +897,8 @@ DltReturnValue dlt_json_filter_save(DltFilter *filter, const char *filename, int

for (int num = 0; num < filter->counter; num++) {
struct json_object *tmp_json_obj = json_object_new_object();
char filter_name[JSON_FILTER_NAME_SIZE];
sprintf(filter_name, "filter%i", num);
char filter_name[JSON_FILTER_NAME_SIZE + 1];
snprintf(filter_name, sizeof(filter_name), "filter%i", num);

if (filter->apid[num][DLT_ID_SIZE - 1] != 0)
json_object_object_add(tmp_json_obj, "AppId", json_object_new_string_len(filter->apid[num], DLT_ID_SIZE));
Expand All @@ -919,7 +919,7 @@ DltReturnValue dlt_json_filter_save(DltFilter *filter, const char *filename, int
}

printf("Saving current filter into '%s'\n", filename);
json_object_to_file((char*)filename, json_filter_obj);
json_object_to_file(filename, json_filter_obj);

return DLT_RETURN_OK;
}
Expand All @@ -941,8 +941,8 @@ DltReturnValue dlt_json_filter_save(DltFilter *filter, const char *filename, int
json_encoder_start_object(j_encoder, NULL);

for (int num = 0; num < filter->counter; num++) {
char filter_name[JSON_FILTER_NAME_SIZE];
sprintf(filter_name, "filter%i", num);
char filter_name[JSON_FILTER_NAME_SIZE + 1];
snprintf(filter_name, sizeof(filter_name), "filter%i", num);
json_encoder_start_object(j_encoder, filter_name);

strncpy(s_app_id, filter->apid[num], DLT_ID_SIZE);
Expand Down