diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-08 19:42:57 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-08 19:42:57 +0000 |
| commit | 3098c0182f1c152c573ce964bfbb1b3318af7725 (patch) | |
| tree | 9dfb8721cf37d7e6494fea4ed7b6d714ad14d8bd | |
| parent | e7f1679373794169594f22444466cf6d907db9b6 (diff) | |
Merged revisions 222873 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r222873 | dvossel | 2009-10-08 14:35:30 -0500 (Thu, 08 Oct 2009) | 6 lines
fixes an ast_netsock_list memory leak.
ABE-1998
Review: https://reviewboard.asterisk.org/r/395/
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@222876 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | include/asterisk/netsock.h | 2 | ||||
| -rw-r--r-- | main/netsock.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/include/asterisk/netsock.h b/include/asterisk/netsock.h index 2aeb803b4..95eeb8cd0 100644 --- a/include/asterisk/netsock.h +++ b/include/asterisk/netsock.h @@ -46,8 +46,6 @@ struct ast_netsock *ast_netsock_bind(struct ast_netsock_list *list, struct io_co struct ast_netsock *ast_netsock_bindaddr(struct ast_netsock_list *list, struct io_context *ioc, struct sockaddr_in *bindaddr, int tos, int cos, ast_io_cb callback, void *data); -int ast_netsock_free(struct ast_netsock_list *list, struct ast_netsock *netsock); - int ast_netsock_release(struct ast_netsock_list *list); struct ast_netsock *ast_netsock_find(struct ast_netsock_list *list, diff --git a/main/netsock.c b/main/netsock.c index 261e234d4..c05bcee6d 100644 --- a/main/netsock.c +++ b/main/netsock.c @@ -74,6 +74,7 @@ int ast_netsock_release(struct ast_netsock_list *list) { ASTOBJ_CONTAINER_DESTROYALL(list, ast_netsock_destroy); ASTOBJ_CONTAINER_DESTROY(list); + ast_free(list); return 0; } |