From d9a817f4316149292c62d280492f68147eef2b22 Mon Sep 17 00:00:00 2001 From: David Vossel Date: Thu, 8 Oct 2009 19:41:58 +0000 Subject: [PATCH] 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: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@222874 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- include/asterisk/netsock.h | 2 -- main/netsock.c | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/include/asterisk/netsock.h b/include/asterisk/netsock.h index 00a14b4841..494efcf39e 100644 --- a/include/asterisk/netsock.h +++ b/include/asterisk/netsock.h @@ -45,8 +45,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 24c6f12b52..e4cfb3bd3b 100644 --- a/main/netsock.c +++ b/main/netsock.c @@ -81,6 +81,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; }