Merged revisions 331147,331200 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/10

................
  r331147 | may | 2011-08-09 20:16:55 +0400 (Tue, 09 Aug 2011) | 11 lines
  
  Merged revisions 331146 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r331146 | may | 2011-08-09 20:13:09 +0400 (Tue, 09 Aug 2011) | 4 lines
    
    move ast_cond_signal for admitted call after all data filled/freed
    clear all log channels by pointed number not only first
    free allocated callToken in ooh323_answer
  ........
................
  r331200 | may | 2011-08-09 20:36:39 +0400 (Tue, 09 Aug 2011) | 9 lines
  
  Setup IP proto version for call in GK mode
  Added additional check for IP semantics before parse destination
  by ast_parse_args due to it can parse numeric as IP.
  
   (closes issue ASTERISK-18218)
   Reported by: slesru
   Patch: ASTERISK-18218.patch
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331202 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Alexandr Anikin
2011-08-09 17:12:27 +00:00
parent c3bd5892a6
commit 1626b29f6f
4 changed files with 12 additions and 4 deletions

View File

@@ -1123,6 +1123,9 @@ static int ooh323_answer(struct ast_channel *ast)
ast_channel_unlock(ast);
ooAnswerCall(p->callToken);
}
if (callToken) {
free(callToken);
}
ast_mutex_unlock(&p->lock);
}