sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "res_stasis: trigger cleanup after update" into 16

This commit is contained in:
Friendly Automation 2020-01-30 10:02:16 -06:00 committed by Gerrit Code Review
parent b5b00e5299 dc9875815c
commit 88e67b51f2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
res/res_stasis.c
View File

@ -1715,12 +1715,11 @@ static int __stasis_app_register(const char *app_name, stasis_app_cb handler, vo
if (app) {
/*
* We need to unlock the apps_registry before calling app_update to
* prevent the possibility of a deadlock with the session. We'll still
* run the lazy cleanup first though.
* prevent the possibility of a deadlock with the session.
*/
cleanup();
ao2_unlock(apps_registry);
app_update(app, handler, data);
cleanup();
return 0;
}
@ -1745,11 +1744,12 @@ static int __stasis_app_register(const char *app_name, stasis_app_cb handler, vo
}
ao2_link_flags(apps_registry, app, OBJ_NOLOCK);
ao2_unlock(apps_registry);
/* We lazily clean up the apps_registry, because it's good enough to
* prevent memory leaks, and we're lazy.
*/
cleanup();
ao2_unlock(apps_registry);
return 0;
}