Merged revisions 321392 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r321392 | rmudgett | 2011-05-27 18:45:41 -0500 (Fri, 27 May 2011) | 12 lines Crash when using hagi and no servers are available. When none of the servers returned by the SRV querey respond, asterisk crashes. The problem is that if the loop over all the SRV entries finishes then the srv_context has already been cleaned up. * Make ast_srv_cleanup() check to see if the context is already cleaned up. (closes issue #19256) Reported by: byronclark ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@321393 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
c02794a6c1
commit
c3d299d291
|
@ -249,7 +249,11 @@ void ast_srv_cleanup(struct srv_context **context)
|
|||
const char *host;
|
||||
unsigned short port;
|
||||
|
||||
while (!(ast_srv_lookup(context, NULL, &host, &port)));
|
||||
if (*context) {
|
||||
/* We have a context to clean up. */
|
||||
while (!(ast_srv_lookup(context, NULL, &host, &port))) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
int ast_get_srv(struct ast_channel *chan, char *host, int hostlen, int *port, const char *service)
|
||||
|
|
Reference in New Issue