[asterisk-commits] rmudgett: trunk r321393 - in /trunk: ./ main/srv.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Fri May 27 18:46:07 2011
New Revision: 321393

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=321393
Log:
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) | 1 line
  
  Don't run the risk of a DNS SRV lookup if already cleaned up.
........

Modified:
    trunk/   (props changed)
    trunk/main/srv.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/main/srv.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/srv.c?view=diff&rev=321393&r1=321392&r2=321393
==============================================================================
--- trunk/main/srv.c (original)
+++ trunk/main/srv.c Fri May 27 18:46:07 2011
@@ -249,7 +249,11 @@
 	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)