From: Sean Bright <sean@malleable.com>
Date: Wed, 19 Jan 2011 17:58:11 +0000 (+0000)
Subject: Merged revisions 302504 via svnmerge from
X-Git-Tag: 1.8.4-rc1~108
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=01e8f4ef1bee4658c6cf69cf637d83df2df02314;p=thirdparty%2Fasterisk.git

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)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@302505 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/utils.c b/main/utils.c
index 687a6ec420..2f7086a0df 100644
--- a/main/utils.c
+++ b/main/utils.c
@@ -208,6 +208,8 @@ struct hostent *ast_gethostbyname(const char *host, struct ast_hostent *hp)
 		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;