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

Make sure filter_pattern can fit in test_filter #42

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Make sure filter_pattern can fit in test_filter #42

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
23 changes: 20 additions & 3 deletions include/rktest/rktest.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -921,12 +921,29 @@ static rktest_config_t parse_args(int argc, const char* argv[]) {
else if (string_starts_with(arg, "--rktest_filter=")) {
const char* filter_pattern = arg + strlen("--rktest_filter=");
const size_t filter_len = strlen(filter_pattern);
if (filter_len > RKTEST_MAX_FILTER_LENGTH) {
fprintf(stderr, "Error: filter pattern too long. Max length is (%d)", RKTEST_MAX_FILTER_LENGTH);
const size_t max_filter_len = RKTEST_MAX_FILTER_LENGTH - 1;
if (filter_len > max_filter_len) {
fprintf(stderr, "Error: filter pattern too long. Max length is (%lu)", max_filter_len);
Comment on lines +924 to +926
Copy link
Owner

@Warwolt Warwolt Feb 9, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
const size_t max_filter_len = RKTEST_MAX_FILTER_LENGTH - 1;
if (filter_len > max_filter_len) {
fprintf(stderr, "Error: filter pattern too long. Max length is (%lu)", max_filter_len);
if (strlen(filter_pattern) > RKTEST_MAX_FILTER_LENGTH - 1) {
fprintf(stderr, "Error: filter pattern too long. Max length is (%lu)", RKTEST_MAX_FILTER_LENGTH - 1));

fprintf(stderr, "filter pattern = \"%s\"", filter_pattern);
exit(1);
}
strncpy(config.test_filter, filter_pattern, filter_len);
// strncpy will copy all bytes up to a NULL in the source or until it
// reaches the size in the third param.
//
// This means if the source string is equal to or greater than the length,
// it will not add a NULL to the end of the destination.
//
// Examples from the strncpy man page are useful,
//
// strncpy(buf, "1", 5); // { '1', 0, 0, 0, 0 }
// strncpy(buf, "1234", 5); // { '1', '2', '3', '4', 0 }
// strncpy(buf, "12345", 5); // { '1', '2', '3', '4', '5' }
// strncpy(buf, "123456", 5); // { '1', '2', '3', '4', '5' }
//
// So if test_filter is a char[256], then max_filter_len will be 255 and if
// filter_pattern is also 255, then it will have one character left which
// strncpy will make a NULL.
strncpy(config.test_filter, filter_pattern, max_filter_len);
Comment on lines +930 to +946
Copy link
Owner

@Warwolt Warwolt Feb 9, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// strncpy will copy all bytes up to a NULL in the source or until it
// reaches the size in the third param.
//
// This means if the source string is equal to or greater than the length,
// it will not add a NULL to the end of the destination.
//
// Examples from the strncpy man page are useful,
//
// strncpy(buf, "1", 5); // { '1', 0, 0, 0, 0 }
// strncpy(buf, "1234", 5); // { '1', '2', '3', '4', 0 }
// strncpy(buf, "12345", 5); // { '1', '2', '3', '4', '5' }
// strncpy(buf, "123456", 5); // { '1', '2', '3', '4', '5' }
//
// So if test_filter is a char[256], then max_filter_len will be 255 and if
// filter_pattern is also 255, then it will have one character left which
// strncpy will make a NULL.
strncpy(config.test_filter, filter_pattern, max_filter_len);
strncpy(config.test_filter, filter_pattern, RKTEST_MAX_FILTER_LENGTH - 1);

}

else if (string_starts_with(arg, "--rktest_print_time=")) {
Expand Down