[asterisk-commits] seanbright: branch 1.8 r302505 - in /branches/1.8: ./ main/utils.c

[SVN commits to the Asterisk project]

Author: seanbright
Date: Wed Jan 19 11:58:11 2011
New Revision: 302505

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=302505
Log:
Merged revisions 302504 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

........
  r302504 | seanbright | 2011-01-19 12:56:32 -0500 (Wed, 19 Jan 2011) | 7 lines
  
  Make sure that h_length is set when we short-circuit out of ast_gethostbyname.
  
  (closes issue #16135)
  Reported by: thedavidfactor
  Patches:
        utils.patch uploaded by thedavidfactor (license 903)
........

Modified:
    branches/1.8/   (props changed)
    branches/1.8/main/utils.c

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

Modified: branches/1.8/main/utils.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/main/utils.c?view=diff&rev=302505&r1=302504&r2=302505
==============================================================================
--- branches/1.8/main/utils.c (original)
+++ branches/1.8/main/utils.c Wed Jan 19 11:58:11 2011
@@ -208,6 +208,8 @@
 		hp->hp.h_addrtype = AF_INET;
 		hp->hp.h_addr_list = (void *) hp->buf;
 		hp->hp.h_addr = hp->buf + sizeof(void *);
+		/* For AF_INET, this will always be 4 */
+		hp->hp.h_length = 4;
 		if (inet_pton(AF_INET, host, hp->hp.h_addr) > 0)
 			return &hp->hp;
 		return NULL;