From 85ef0289cae989e70277aa8fc988e8dc5808da61 Mon Sep 17 00:00:00 2001 From: Richard Mudgett Date: Mon, 11 Oct 2010 18:29:43 +0000 Subject: [PATCH] Add missing unlock to an exception condition in reload_config(). git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@291109 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 109b46e83a..413a03c585 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -16740,9 +16740,13 @@ static int handle_request_register(struct sip_pvt *p, struct sip_request *req, s return res; } -/*! \brief Handle incoming SIP requests (methods) -\note This is where all incoming requests go first */ -/* called with p and p->owner locked */ +/*! + * \brief Handle incoming SIP requests (methods) + * \note + * This is where all incoming requests go first. + * \note + * called with p and p->owner locked + */ static int handle_request(struct sip_pvt *p, struct sip_request *req, struct sockaddr_in *sin, int *recount, int *nounlock) { /* Called with p->lock held, as well as p->owner->lock if appropriate, keeping things @@ -19167,6 +19171,7 @@ static int reload_config(enum channelreloadreason reason) if (sipsock < 0) { ast_log(LOG_WARNING, "Unable to create SIP socket: %s\n", strerror(errno)); ast_config_destroy(cfg); + ast_mutex_unlock(&netlock); return -1; } else { /* Allow SIP clients on the same host to access us: */ -- 2.47.2