kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-16 14:58:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash caused by unloading or reloading of res_http_post

Browse Source 
When unlinking itself from the registered HTTP URIs, res_http_post could
inadvertently free all URIs registered with the HTTP server.  This patch
modifies the unregister method to only free the URI that is actually
being unregistered, as opposed to all of them.
........

Merged revisions 361803 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 361804 from http://svn.asterisk.org/svn/asterisk/branches/10


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@361805 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Jordan
2012-04-10 19:58:04 +00:00
parent 38c0a62413
commit 3d7b9e7fb1
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main/http.c
View File

@@ -581,7 +581,6 @@ void ast_http_uri_unlink_all_with_key(const char *key)
AST_RWLIST_TRAVERSE_SAFE_BEGIN(&uris, urih, entry) { AST_RWLIST_TRAVERSE_SAFE_BEGIN(&uris, urih, entry) {
if (!strcmp(urih->key, key)) { if (!strcmp(urih->key, key)) {
AST_RWLIST_REMOVE_CURRENT(entry); AST_RWLIST_REMOVE_CURRENT(entry);
}
if (urih->dmallocd) { if (urih->dmallocd) {
ast_free(urih->data); ast_free(urih->data);
} }
@@ -589,6 +588,7 @@ void ast_http_uri_unlink_all_with_key(const char *key)
ast_free(urih); ast_free(urih);
} }
} }
}
AST_RWLIST_TRAVERSE_SAFE_END; AST_RWLIST_TRAVERSE_SAFE_END;
AST_RWLIST_UNLOCK(&uris); AST_RWLIST_UNLOCK(&uris);
} }