From: Igor Goncharovskiy <igor.goncharovsky@gmail.com>
Date: Sat, 8 Oct 2011 15:46:27 +0000 (+0000)
Subject: Merged revisions 339884 via svnmerge from
X-Git-Tag: 10.0.0-rc1~99
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b1db303a304b7b869f539e4231f966e645ea2c4;p=thirdparty%2Fasterisk.git

Merged revisions 339884 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r339884 | igorg | 2011-10-08 22:45:20 +0700 (Сбт, 08 Окт 2011) | 7 lines


  Fix segfault in Unistim channel

  (closes issue ASTERISK-18638)
  Reported by: jonnt
........


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

diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c
index 1753365e9c..47301f356f 100644
--- a/channels/chan_unistim.c
+++ b/channels/chan_unistim.c
@@ -882,6 +882,7 @@ static struct unistimsession *create_client(const struct sockaddr_in *addr_from)
 
 	memcpy(&s->sin, addr_from, sizeof(struct sockaddr_in));
 	get_to_address(unistimsock, &s->sout);
+	sout.sin_family = AF_INET;
 	if (unistimdebug) {
 		ast_verb(0, "Creating a new entry for the phone from %s received via server ip %s\n",
 			 ast_inet_ntoa(addr_from->sin_addr), ast_inet_ntoa(s->sout.sin_addr));