github/xrdp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve security level logging at ISO layer

Browse Source
This commit is contained in:
matt335672
2021-08-26 15:31:38 +01:00
parent b56bd78c08
commit 62ca216d4d
4 changed files with 320 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/common/test_string_calls.c
+119
View File
@@ -213,12 +213,123 @@ START_TEST(test_strnjoin__when_always__then_doesnt_write_beyond_end_of_destinati
}
END_TEST
/******************************************************************************/
START_TEST(test_bm2str__no_bits_defined)
{
int rv;
char buff[64];
static const struct bitmask_string bits[] =
{
BITMASK_STRING_END_OF_LIST
};
rv = g_bitmask_to_str(0xffff, bits, ',', buff, sizeof(buff));
ck_assert_str_eq(buff, "0xffff");
ck_assert_int_eq(rv, 6);
}
END_TEST
START_TEST(test_bm2str__all_bits_defined)
{
int rv;
char buff[64];
static const struct bitmask_string bits[] =
{
{1 << 0, "BIT_0"},
{1 << 1, "BIT_1"},
{1 << 6, "BIT_6"},
{1 << 7, "BIT_7"},
BITMASK_STRING_END_OF_LIST
};
int bitmask = 1 << 0 | 1 << 1 | 1 << 6 | 1 << 7;
rv = g_bitmask_to_str(bitmask, bits, '|', buff, sizeof(buff));
ck_assert_str_eq(buff, "BIT_0|BIT_1|BIT_6|BIT_7");
ck_assert_int_eq(rv, (6 * 4) - 1);
}
END_TEST
START_TEST(test_bm2str__some_bits_undefined)
{
int rv;
char buff[64];
static const struct bitmask_string bits[] =
{
{1 << 0, "BIT_0"},
{1 << 1, "BIT_1"},
{1 << 6, "BIT_6"},
{1 << 7, "BIT_7"},
BITMASK_STRING_END_OF_LIST
};
int bitmask = 1 << 0 | 1 << 1 | 1 << 16;
rv = g_bitmask_to_str(bitmask, bits, ':', buff, sizeof(buff));
ck_assert_str_eq(buff, "BIT_0:BIT_1:0x10000");
ck_assert_int_eq(rv, (6 * 2) + 7);
}
END_TEST
START_TEST(test_bm2str__overflow_all_bits_defined)
{
int rv;
char buff[10];
static const struct bitmask_string bits[] =
{
{1 << 0, "BIT_0"},
{1 << 1, "BIT_1"},
{1 << 6, "BIT_6"},
{1 << 7, "BIT_7"},
BITMASK_STRING_END_OF_LIST
};
int bitmask = 1 << 0 | 1 << 1 | 1 << 6 | 1 << 7;
rv = g_bitmask_to_str(bitmask, bits, '+', buff, sizeof(buff));
ck_assert_str_eq(buff, "BIT_0+BIT");
ck_assert_int_eq(rv, (4 * 6) - 1);
}
END_TEST
START_TEST(test_bm2str__overflow_some_bits_undefined)
{
int rv;
char buff[16];
static const struct bitmask_string bits[] =
{
{1 << 0, "BIT_0"},
{1 << 1, "BIT_1"},
{1 << 6, "BIT_6"},
{1 << 7, "BIT_7"},
BITMASK_STRING_END_OF_LIST
};
int bitmask = 1 << 0 | 1 << 1 | 1 << 16;
rv = g_bitmask_to_str(bitmask, bits, '#', buff, sizeof(buff));
ck_assert_str_eq(buff, "BIT_0#BIT_1#0x1");
ck_assert_int_eq(rv, (6 * 2) + 7);
}
END_TEST
/******************************************************************************/
Suite *
make_suite_test_string(void)
{
Suite *s;
TCase *tc_strnjoin;
TCase *tc_bm2str;
s = suite_create("String");
@@ -236,5 +347,13 @@ make_suite_test_string(void)
tcase_add_test(tc_strnjoin, test_strnjoin__when_destination_has_contents__returns_joined_string_with_content_overwritten);
tcase_add_test(tc_strnjoin, test_strnjoin__when_always__then_doesnt_write_beyond_end_of_destination);
tc_bm2str = tcase_create("bm2str");
suite_add_tcase(s, tc_bm2str);
tcase_add_test(tc_bm2str, test_bm2str__no_bits_defined);
tcase_add_test(tc_bm2str, test_bm2str__all_bits_defined);
tcase_add_test(tc_bm2str, test_bm2str__some_bits_undefined);
tcase_add_test(tc_bm2str, test_bm2str__overflow_all_bits_defined);
tcase_add_test(tc_bm2str, test_bm2str__overflow_some_bits_undefined);
return s;
}