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

Fix problems detected by -fsanitize=address

Browse Source
This commit is contained in:
matt335672 2024-05-07 12:01:50 +01:00
parent 67ace5c59d
commit 4e77772ea2
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/list.c
View File

@ -345,7 +345,14 @@ int
split_string_append_fragment(const char **start, const char *end, split_string_append_fragment(const char **start, const char *end,
struct list *list) struct list *list)
{ {
const unsigned int len = end - *start; unsigned int len = end - *start;
// Check for an unexpected terminator in the string
const char *term = (const char *)memchr(*start, '\0', len);
if (term != NULL)
{
end = term;
len = end - *start;
}
char *copy = (char *)malloc(len + 1); char *copy = (char *)malloc(len + 1);
if (copy == NULL) if (copy == NULL)
{ {

4
tests/common/test_os_calls_signals.c
View File

@ -111,7 +111,7 @@ START_TEST(test_g_signal_child_stop_1)
// Before raising the signal, change directory to a non-writeable // Before raising the signal, change directory to a non-writeable
// one to avoid generating a corefile. // one to avoid generating a corefile.
g_set_current_dir("/"); g_set_current_dir("/");
raise(SIGSEGV); raise(SIGUSR2);
} }
ck_assert_int_ne(pid, 0); ck_assert_int_ne(pid, 0);
g_obj_wait(&g_wobj1, 1, NULL, 0, 2000); g_obj_wait(&g_wobj1, 1, NULL, 0, 2000);
@ -120,7 +120,7 @@ START_TEST(test_g_signal_child_stop_1)
e = g_waitpid_status(pid); e = g_waitpid_status(pid);
ck_assert_int_eq(e.reason, E_PXR_SIGNAL); ck_assert_int_eq(e.reason, E_PXR_SIGNAL);
ck_assert_int_eq(e.val, SIGSEGV); ck_assert_int_eq(e.val, SIGUSR2);
// Clean up // Clean up
g_signal_child_stop(NULL); g_signal_child_stop(NULL);

1
tests/xrdp/test_xrdp_egfx.c
View File

@ -54,6 +54,7 @@ START_TEST(test_xrdp_egfx_send_create_surface__happy_path)
in_uint8(s, descriptor); in_uint8(s, descriptor);
ck_assert_int_eq(0xE0, descriptor); ck_assert_int_eq(0xE0, descriptor);
free_stream(s);
g_free(bulk); g_free(bulk);
} }
END_TEST END_TEST