From 91893afb5695e5bb47d476f4d07c236fb7395af5 Mon Sep 17 00:00:00 2001 From: mmichelson Date: Fri, 10 Oct 2008 21:18:43 +0000 Subject: Merged revisions 148373 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r148373 | mmichelson | 2008-10-10 16:18:10 -0500 (Fri, 10 Oct 2008) | 8 lines Make sure that the inUse and inRinging fields for a sip peer cannot go below zero. This is a regression from 1.4 and so it will be applied to 1.6.0 as well. (closes issue #13668) Reported by: mjc ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@148374 f38db490-d61c-443f-a65b-d21fe96a405b --- channels/chan_sip.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'channels') diff --git a/channels/chan_sip.c b/channels/chan_sip.c index ae3f7b3aa..cf3f7991d 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -4517,13 +4517,13 @@ static int update_call_counter(struct sip_pvt *fup, int event) /* incoming and outgoing affects the inUse counter */ case DEC_CALL_LIMIT: /* Decrement inuse count if applicable */ - if (inuse && ast_test_flag(&fup->flags[0], SIP_INC_COUNT)) { + if (inuse && *inuse > 0 && ast_test_flag(&fup->flags[0], SIP_INC_COUNT)) { ast_atomic_fetchadd_int(inuse, -1); ast_clear_flag(&fup->flags[0], SIP_INC_COUNT); } else *inuse = 0; /* Decrement ringing count if applicable */ - if (inringing && ast_test_flag(&fup->flags[0], SIP_INC_RINGING)) { + if (inringing && *inringing > 0 && ast_test_flag(&fup->flags[0], SIP_INC_RINGING)) { ast_atomic_fetchadd_int(inringing, -1); ast_clear_flag(&fup->flags[0], SIP_INC_RINGING); } @@ -4564,7 +4564,7 @@ static int update_call_counter(struct sip_pvt *fup, int event) break; case DEC_CALL_RINGING: - if (inringing && ast_test_flag(&fup->flags[0], SIP_INC_RINGING)) { + if (inringing && *inringing > 0 && ast_test_flag(&fup->flags[0], SIP_INC_RINGING)) { ast_atomic_fetchadd_int(inringing, -1); ast_clear_flag(&fup->flags[0], SIP_INC_RINGING); } -- cgit v1.2.3