sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

call-list: fix a race condition in ofono_call_list_dial_callback 

If ofono_call_list_dial_callback is called later than
ofono_call_list_notify, the new call is added, removed, added
again.
This commit is contained in:
Alexander Couzens 2017-10-17 10:11:19 +02:00
parent 1bc7ffe333
commit 69bc287991
2 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/call-list.c
View File

@ -32,6 +32,16 @@ void ofono_call_list_dial_callback(struct ofono_voicecall *vc,
int call_id)
{
struct ofono_call *call;
GSList *list;
/* check if call_id already present */
list = g_slist_find_custom(*call_list,
GINT_TO_POINTER(call_id),
ofono_call_compare_by_id);
if (list) {
return;
}
call = g_new0(struct ofono_call, 1);
call->id = call_id;

27
unit/test-call-list.c
View File

@ -213,11 +213,38 @@ static void test_dial_callback(void)
g_slist_free_full(call_list, g_free);
}
static void test_dial_callback_race(void)
{
struct ofono_voicecall *vc = NULL;
struct ofono_phone_number ph;
struct ofono_call *call;
GSList *call_list, *calls;
/* reset test */
reset_notified();
call_list = NULL;
strcpy(ph.number, "0099301234567890");
ph.type = 0;
/* outgoing call */
calls = create_call(NULL, 1, CALL_STATUS_DIALING,
CALL_DIRECTION_MOBILE_ORIGINATED);
ofono_call_list_notify(vc, &call_list, calls);
ofono_call_list_dial_callback(vc, &call_list, &ph, 1);
g_assert(call_list->next == NULL);
/* check how many items in the variable */
g_slist_free_full(call_list, g_free);
}
int main(int argc, char **argv)
{
g_test_init(&argc, &argv, NULL);
g_test_add_func("/test-call-list/dial_callback", test_dial_callback);
g_test_add_func("/test-call-list/dial_callback_race", test_dial_callback_race);
g_test_add_func("/test-call-list/test_notify", test_notify);
g_test_add_func("/test-call-list/test_notify_disconnected",
test_notify_disconnected);