kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-14 08:31:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't attempt a websocket protocol removal if res_http_websocket isn't there

Browse Source 
This patch sets the protocols container provided by res_http_websocket to NULL
when the module gets unloaded and adds the necessary checks when adding/
removing a websocket protocol. This prevents some FRACKing on an invalid
pointer to the disposed container if a module that uses res_http_websocket is
unloaded after it.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@384942 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Jordan
2013-04-08 15:38:34 +00:00
parent b8d4e573f1
commit a5df2542c3
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
res/res_http_websocket.c
View File

@@ -122,6 +122,10 @@ int AST_OPTIONAL_API_NAME(ast_websocket_add_protocol)(const char *name, ast_webs
{ {
struct websocket_protocol *protocol; struct websocket_protocol *protocol;
if (!protocols) {
return -1;
}
ao2_lock(protocols); ao2_lock(protocols);
/* Ensure a second protocol handler is not registered for the same protocol */ /* Ensure a second protocol handler is not registered for the same protocol */
@@ -157,6 +161,10 @@ int AST_OPTIONAL_API_NAME(ast_websocket_remove_protocol)(const char *name, ast_w
{ {
struct websocket_protocol *protocol; struct websocket_protocol *protocol;
if (!protocols) {
return -1;
}
if (!(protocol = ao2_find(protocols, name, OBJ_KEY))) { if (!(protocol = ao2_find(protocols, name, OBJ_KEY))) {
return -1; return -1;
} }
@@ -670,6 +678,7 @@ static int unload_module(void)
ast_websocket_remove_protocol("echo", websocket_echo_callback); ast_websocket_remove_protocol("echo", websocket_echo_callback);
ast_http_uri_unlink(&websocketuri); ast_http_uri_unlink(&websocketuri);
ao2_ref(protocols, -1); ao2_ref(protocols, -1);
protocols = NULL;
return 0; return 0;
} }

7
res/res_stasis_websocket.c
View File

@@ -305,7 +305,7 @@ static int load_module(void)
/* ironic */ /* ironic */
return AST_MODULE_LOAD_FAILURE; return AST_MODULE_LOAD_FAILURE;
} }
r |= ast_websocket_add_protocol(ws_protocol, websocket_callback); r |= ast_websocket_add_protocol(ws_protocol, websocket_callback);
return r; return r;
} }
@@ -315,12 +315,13 @@ static int unload_module(void)
ast_json_unref(oom_json); ast_json_unref(oom_json);
oom_json = NULL; oom_json = NULL;
r |= ast_websocket_remove_protocol(ws_protocol, websocket_callback); r |= ast_websocket_remove_protocol(ws_protocol, websocket_callback);
return r; return r;
} }
AST_MODULE_INFO(ASTERISK_GPL_KEY, 0, "Stasis HTTP bindings", AST_MODULE_INFO(ASTERISK_GPL_KEY, 0, "Stasis HTTP bindings",
.load = load_module, .load = load_module,
.unload = unload_module, .unload = unload_module,
.nonoptreq = "app_stasis,res_http_websocket" .nonoptreq = "app_stasis,res_http_websocket",
.load_pri = AST_MODPRI_APP_DEPEND,
); );