[asterisk-commits] mmichelson: branch 1.6.0 r112157 - in /branches/1.6.0: ./ main/dns.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Tue Apr  1 12:25:05 2008
New Revision: 112157

URL: http://svn.digium.com/view/asterisk?view=rev&rev=112157
Log:
Merged revisions 112148 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r112148 | mmichelson | 2008-04-01 12:23:19 -0500 (Tue, 01 Apr 2008) | 18 lines

Merged revisions 112138 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r112138 | mmichelson | 2008-04-01 12:21:21 -0500 (Tue, 01 Apr 2008) | 10 lines

Initialize the __res_state structure used for dns purposes
to all 0's prior to using it. This is due to valgrind's complaints
on issue #12284 as well as an excerpt found in "Description" portion
of the online man page found here:

http://www.iti.cs.tu-bs.de/cgi-bin/UNIXhelp/man-cgi?res_nquery+3RESOLV

(pertains to issue #12284 but does not necessarily close it)


........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/dns.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/dns.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/dns.c?view=diff&rev=112157&r1=112156&r2=112157
==============================================================================
--- branches/1.6.0/main/dns.c (original)
+++ branches/1.6.0/main/dns.c Tue Apr  1 12:25:05 2008
@@ -263,6 +263,7 @@
 	int res, ret = -1;
 
 #ifdef HAVE_RES_NINIT
+	memset(&dnsstate, 0, sizeof(dnsstate));
 	res_ninit(&dnsstate);
 	res = res_nsearch(&dnsstate, dname, class, type, answer, sizeof(answer));
 #else